From afa2c600e71aa6eaad32bc208b0080a4bdea83d7 Mon Sep 17 00:00:00 2001 From: Luis Tomas Bolivar Date: Mon, 15 Jun 2020 13:50:15 +0200 Subject: [PATCH 1/7] Kuryr: Add information about amphora to ovn-octavia upgrades This PR describe the steps to performan an amphora to ovn-octavia migration when using Kuryr. This allows to avoid the problem of generating one VM per services when using Kuryr as CNI. --- ...ation-osp-kuryr-octavia-configuration.adoc | 78 ++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index 2f56b63e8fee..ef96fa9297f1 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -199,7 +199,7 @@ controller-0$ sudo docker restart octavia_worker [NOTE] ==== Depending on your {rh-openstack} environment, Octavia might not support UDP -listeners. If you use Kuryr SDN on OpenStack version 15 or earlier, UDP services are not supported. +listeners. If you use Kuryr SDN on OpenStack version 15 or earlier, UDP services are not supported. {rh-openstack} version 16 or later support UDP. ==== @@ -240,3 +240,79 @@ If Kuryr uses `ovn` instead of Amphora, it offers the following benefits: * Reduced network latency. * Increased service creation speed by using OpenFlow rules instead of a VM for each Service. * Distributed load balancing actions across all nodes instead of centralized on Amphora VMs. + + +[id="installation-osp-kuryr-octavia-driver_upgrade_{context}"] +== Upgrading to Octavia OVN Driver on existing deployments + +It is possible to upgrade {product-title} that has been deployed before OVN Octavia driver was made available on the {rh-openstack} side. +The steps to perform the upgrade from amphora to ovn-octavia are the next: + +[NOTE] +==== +Upgrading from amphora to ovn-octavia loadbalancer requires recreation of the +loadbalancers, which means there will be some downtime when accessing the pods +through their associated services -- time needed to delete the amphora load +balancer plus the time needed to create the ovn load balancer. +==== + +.Procedure + +. Check ovn-octavia driver is available ++ +---- +$ openstack loadbalancer provider list ++---------+-------------------------------------------------+ +| name    | description                                     | ++---------+-------------------------------------------------+ +| amphora | The Octavia Amphora driver.                     | +| octavia | Deprecated alias of the Octavia Amphora driver. | +| ovn     | Octavia OVN driver.                             | ++---------+-------------------------------------------------+ +---- + +. Edit the `kuryr-config` ConfigMap to trigger the recreation. You simply need +to delete the annotation that states the `default` kuryr-octavia-provider is +being used: ++ +---- +$ oc -n openshift-kuryr edit cm kuryr-config +... +kind: ConfigMap +metadata: + annotations: + networkoperator.openshift.io/kuryr-octavia-provider: default <-- Remove this line +... +---- + +. Wait until Cluster Network Operator reconcile loop is executed and detects the +modification, triggering the recreation of the kuryr-controller and kuryr-cni +pods + +. Check `kuryr-config` ConfigMap annotation has been readded but indicating the +`ovn` driver is being used ++ +---- +$ oc -n openshift-kuryr edit cm kuryr-config +... +kind: ConfigMap +metadata: + annotations: + networkoperator.openshift.io/kuryr-octavia-provider: ovn +... +---- + +. Wait until all the loadbalancers have been recreated. Only one amphora +loadbalancer must remain (the one created by Cluster Network Operator) and the +rest should be of ovn type: ++ +---- +$ openstack loadbalancer list | grep amphora +a4db683b-2b7b-4988-a582-c39daaad7981 | ostest-7mbj6-kuryr-api-loadbalancer | 84c99c906edd475ba19478a9a6690efd | 172.30.0.1 | ACTIVE | amphora +$ openstack loadbalancer list | grep ovn +2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn +0b1b2193-251f-4243-af39-2f99b29d18c5 | openshift-etcd/etcd | 84c99c906edd475ba19478a9a6690efd | 172.30.143.226 | ACTIVE | ovn +f05b07fc-01b7-4673-bd4d-adaa4391458e | openshift-dns-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.152.27 | ACTIVE | ovn +.... +---- + From 34e8a3d92b41bcfe34ab300cafcf85590a645ae5 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Mon, 29 Jun 2020 12:33:05 -0400 Subject: [PATCH 2/7] Editing pass --- ...ation-osp-kuryr-octavia-configuration.adoc | 85 ++++++++++++------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index 41d4ad4b3c63..5759fb257e97 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -243,57 +243,63 @@ If Kuryr uses `ovn` instead of Amphora, it offers the following benefits: [id="installation-osp-kuryr-octavia-driver_upgrade_{context}"] -== Upgrading to Octavia OVN Driver on existing deployments +== Upgrading Octavia provider drivers after installation -It is possible to upgrade {product-title} that has been deployed before OVN Octavia driver was made available on the {rh-openstack} side. -The steps to perform the upgrade from amphora to ovn-octavia are the next: +You can upgrade a cluster that is deployed on {rh-openstack-first} from the Octavia Amphora +provider driver to the Octavia OVN provider driver. -[NOTE] +[IMPORTANT] +==== +{rh-openstack} replaces existing load balancers after you change provider drivers. This process +results in some downtime. +==== + +.Prerequisites + +* Install the {rh-openstack} CLI, `openstack`. + +* Install the {product-title} CLI, `oc`. + +* Enable the Octavia OVN driver on {rh-openstack}. ++ +[TIP] ==== -Upgrading from amphora to ovn-octavia loadbalancer requires recreation of the -loadbalancers, which means there will be some downtime when accessing the pods -through their associated services -- time needed to delete the amphora load -balancer plus the time needed to create the ovn load balancer. +To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. ==== .Procedure -. Check ovn-octavia driver is available +To change from the Octavia Amphora provider driver to Octavia OVN: + +. Open the `kuryr-config` ConfigMap. On a command line, enter: + ---- -$ openstack loadbalancer provider list -+---------+-------------------------------------------------+ -| name    | description                                     | -+---------+-------------------------------------------------+ -| amphora | The Octavia Amphora driver.                     | -| octavia | Deprecated alias of the Octavia Amphora driver. | -| ovn     | Octavia OVN driver.                             | -+---------+-------------------------------------------------+ +$ oc -n openshift-kuryr edit cm kuryr-config ---- -. Edit the `kuryr-config` ConfigMap to trigger the recreation. You simply need -to delete the annotation that states the `default` kuryr-octavia-provider is -being used: +. In the ConfigMap, delete the line that contains `kuryr-octavia-provider`. For example: + ---- -$ oc -n openshift-kuryr edit cm kuryr-config ... kind: ConfigMap metadata: annotations: - networkoperator.openshift.io/kuryr-octavia-provider: default <-- Remove this line + networkoperator.openshift.io/kuryr-octavia-provider: default <1> ... ---- +<1> Delete this line. The cluster will regenerate it with `ovn` as the value. ++ +After making this modification, wait for the `kuryr-controller` and `kuryr-cni` pods to redeploy. This process may take several minutes. -. Wait until Cluster Network Operator reconcile loop is executed and detects the -modification, triggering the recreation of the kuryr-controller and kuryr-cni -pods - -. Check `kuryr-config` ConfigMap annotation has been readded but indicating the -`ovn` driver is being used +. Verify that the `kuryr-config` ConfigMap annotation is present with `ovn` as its value. On a command line, enter: + ---- $ oc -n openshift-kuryr edit cm kuryr-config +---- ++ +The `ovn` provider value should be present in the output: ++ +---- ... kind: ConfigMap metadata: @@ -302,17 +308,30 @@ metadata: ... ---- -. Wait until all the loadbalancers have been recreated. Only one amphora -loadbalancer must remain (the one created by Cluster Network Operator) and the -rest should be of ovn type: +. Verify that {rh-openstack} recreated its load balancers. + +.. On a command line, type: + ---- $ openstack loadbalancer list | grep amphora +---- ++ +You should see a single Amphora load balancer. For example: ++ +---- a4db683b-2b7b-4988-a582-c39daaad7981 | ostest-7mbj6-kuryr-api-loadbalancer | 84c99c906edd475ba19478a9a6690efd | 172.30.0.1 | ACTIVE | amphora +---- + +.. Then, type: ++ +---- $ openstack loadbalancer list | grep ovn +---- ++ +The remaining load balancers should be the `ovn` type. For example: ++ +---- 2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn 0b1b2193-251f-4243-af39-2f99b29d18c5 | openshift-etcd/etcd | 84c99c906edd475ba19478a9a6690efd | 172.30.143.226 | ACTIVE | ovn f05b07fc-01b7-4673-bd4d-adaa4391458e | openshift-dns-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.152.27 | ACTIVE | ovn -.... ---- - From a77739fdcff720602c7f44cf386820dfc0422f9c Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Thu, 2 Jul 2020 17:32:00 -0400 Subject: [PATCH 3/7] Changes from dev comments --- modules/installation-osp-kuryr-octavia-configuration.adoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index 5759fb257e97..72c4a6be1f02 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -250,7 +250,7 @@ provider driver to the Octavia OVN provider driver. [IMPORTANT] ==== -{rh-openstack} replaces existing load balancers after you change provider drivers. This process +Kuryr replaces existing load balancers after you change provider drivers. This process results in some downtime. ==== @@ -260,11 +260,12 @@ results in some downtime. * Install the {product-title} CLI, `oc`. -* Enable the Octavia OVN driver on {rh-openstack}. +* Verify that the Octavia OVN driver on {rh-openstack} is enabled. + [TIP] ==== To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. +You should see the `ovn` driver in the command's output. ==== .Procedure @@ -277,7 +278,7 @@ To change from the Octavia Amphora provider driver to Octavia OVN: $ oc -n openshift-kuryr edit cm kuryr-config ---- -. In the ConfigMap, delete the line that contains `kuryr-octavia-provider`. For example: +. In the ConfigMap, delete the line that contains `kuryr-octavia-provider: default`. For example: + ---- ... From 2a5d0893a9acf2db877fdf2d5a4e9ac769964876 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 3 Jul 2020 07:50:41 -0400 Subject: [PATCH 4/7] Dev feedback tweak --- modules/installation-osp-kuryr-octavia-configuration.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index 72c4a6be1f02..efb6d465d4a3 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -290,7 +290,7 @@ metadata: ---- <1> Delete this line. The cluster will regenerate it with `ovn` as the value. + -After making this modification, wait for the `kuryr-controller` and `kuryr-cni` pods to redeploy. This process may take several minutes. +Wait for the Cluster Network Operator to detect the modification and redeploy the `kuryr-controller` and `kuryr-cni` pods. This process may take several minutes. . Verify that the `kuryr-config` ConfigMap annotation is present with `ovn` as its value. On a command line, enter: + From fef0d7ca49f1285de0f3f6621f34c024035e8c4a Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 3 Jul 2020 09:07:32 -0400 Subject: [PATCH 5/7] Some rewording, then moving content to Networking --- _topic_map.yml | 2 + ...ation-osp-kuryr-octavia-configuration.adoc | 96 +----------------- ...nstallation-osp-kuryr-octavia-upgrade.adoc | 98 +++++++++++++++++++ networking/load-balancing-openstack.adoc | 8 ++ 4 files changed, 109 insertions(+), 95 deletions(-) create mode 100644 modules/installation-osp-kuryr-octavia-upgrade.adoc create mode 100644 networking/load-balancing-openstack.adoc diff --git a/_topic_map.yml b/_topic_map.yml index e974a1d59253..a433dd6c10cc 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -562,6 +562,8 @@ Topics: - Name: Configuring a custom PKI File: configuring-a-custom-pki Distros: openshift-enterprise,openshift-webscale,openshift-origin +- Name: Load balancing on OpenStack + File: load-balancing-openstack --- Name: Storage Dir: storage diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index efb6d465d4a3..0d4762322585 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -241,98 +241,4 @@ If Kuryr uses `ovn` instead of Amphora, it offers the following benefits: * Increased service creation speed by using OpenFlow rules instead of a VM for each Service. * Distributed load balancing actions across all nodes instead of centralized on Amphora VMs. - -[id="installation-osp-kuryr-octavia-driver_upgrade_{context}"] -== Upgrading Octavia provider drivers after installation - -You can upgrade a cluster that is deployed on {rh-openstack-first} from the Octavia Amphora -provider driver to the Octavia OVN provider driver. - -[IMPORTANT] -==== -Kuryr replaces existing load balancers after you change provider drivers. This process -results in some downtime. -==== - -.Prerequisites - -* Install the {rh-openstack} CLI, `openstack`. - -* Install the {product-title} CLI, `oc`. - -* Verify that the Octavia OVN driver on {rh-openstack} is enabled. -+ -[TIP] -==== -To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. -You should see the `ovn` driver in the command's output. -==== - -.Procedure - -To change from the Octavia Amphora provider driver to Octavia OVN: - -. Open the `kuryr-config` ConfigMap. On a command line, enter: -+ ----- -$ oc -n openshift-kuryr edit cm kuryr-config ----- - -. In the ConfigMap, delete the line that contains `kuryr-octavia-provider: default`. For example: -+ ----- -... -kind: ConfigMap -metadata: - annotations: - networkoperator.openshift.io/kuryr-octavia-provider: default <1> -... ----- -<1> Delete this line. The cluster will regenerate it with `ovn` as the value. -+ -Wait for the Cluster Network Operator to detect the modification and redeploy the `kuryr-controller` and `kuryr-cni` pods. This process may take several minutes. - -. Verify that the `kuryr-config` ConfigMap annotation is present with `ovn` as its value. On a command line, enter: -+ ----- -$ oc -n openshift-kuryr edit cm kuryr-config ----- -+ -The `ovn` provider value should be present in the output: -+ ----- -... -kind: ConfigMap -metadata: - annotations: - networkoperator.openshift.io/kuryr-octavia-provider: ovn -... ----- - -. Verify that {rh-openstack} recreated its load balancers. - -.. On a command line, type: -+ ----- -$ openstack loadbalancer list | grep amphora ----- -+ -You should see a single Amphora load balancer. For example: -+ ----- -a4db683b-2b7b-4988-a582-c39daaad7981 | ostest-7mbj6-kuryr-api-loadbalancer | 84c99c906edd475ba19478a9a6690efd | 172.30.0.1 | ACTIVE | amphora ----- - -.. Then, type: -+ ----- -$ openstack loadbalancer list | grep ovn ----- -+ -The remaining load balancers should be the `ovn` type. For example: -+ ----- -2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn -0b1b2193-251f-4243-af39-2f99b29d18c5 | openshift-etcd/etcd | 84c99c906edd475ba19478a9a6690efd | 172.30.143.226 | ACTIVE | ovn -f05b07fc-01b7-4673-bd4d-adaa4391458e | openshift-dns-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.152.27 | ACTIVE | ovn ----- +You can link:[configure your cluster to use the Octavia OVN driver] after your {rh-openstack} cloud is upgraded from version 13 to version 16. \ No newline at end of file diff --git a/modules/installation-osp-kuryr-octavia-upgrade.adoc b/modules/installation-osp-kuryr-octavia-upgrade.adoc new file mode 100644 index 000000000000..509bebff3884 --- /dev/null +++ b/modules/installation-osp-kuryr-octavia-upgrade.adoc @@ -0,0 +1,98 @@ +// Module included in the following assemblies: +// +// * networking/openstack/load-balancing-openstack.adoc + +[id="installation-osp-kuryr-octavia-configure{context}"] += Configuring a cluster to use the {rh-openstack} Octavia provider driver + +If your {product-title} cluster uses Kuryr and was installed on a {rh-openstack-first} 13 cloud +that was later upgraded to {rh-openstack} 16, you can configure it to use the Octavia OVN provider driver. + +[IMPORTANT] +==== +Kuryr replaces existing load balancers after you change provider drivers. This process +results in some downtime. +==== + +.Prerequisites + +* Install the {rh-openstack} CLI, `openstack`. + +* Install the {product-title} CLI, `oc`. + +* Verify that the Octavia OVN driver on {rh-openstack} is enabled. ++ +[TIP] +==== +To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. +You should see the `ovn` driver in the command's output. +==== + +.Procedure + +To change from the Octavia Amphora provider driver to Octavia OVN: + +. Open the `kuryr-config` ConfigMap. On a command line, enter: ++ +---- +$ oc -n openshift-kuryr edit cm kuryr-config +---- + +. In the ConfigMap, delete the line that contains `kuryr-octavia-provider: default`. For example: ++ +---- +... +kind: ConfigMap +metadata: + annotations: + networkoperator.openshift.io/kuryr-octavia-provider: default <1> +... +---- +<1> Delete this line. The cluster will regenerate it with `ovn` as the value. ++ +Wait for the Cluster Network Operator detects the modification and redeploys the `kuryr-controller` and `kuryr-cni` pods. This process may take several minutes. + +. Verify that the `kuryr-config` ConfigMap annotation is present with `ovn` as its value. On a command line, enter: ++ +---- +$ oc -n openshift-kuryr edit cm kuryr-config +---- ++ +The `ovn` provider value should be present in the output: ++ +---- +... +kind: ConfigMap +metadata: + annotations: + networkoperator.openshift.io/kuryr-octavia-provider: ovn +... +---- + +. Verify that {rh-openstack} recreated its load balancers. + +.. On a command line, type: ++ +---- +$ openstack loadbalancer list | grep amphora +---- ++ +You should see a single Amphora load balancer. For example: ++ +---- +a4db683b-2b7b-4988-a582-c39daaad7981 | ostest-7mbj6-kuryr-api-loadbalancer | 84c99c906edd475ba19478a9a6690efd | 172.30.0.1 | ACTIVE | amphora +---- + +.. Then, type: ++ +---- +$ openstack loadbalancer list | grep ovn +---- ++ +The remaining load balancers should be the `ovn` type. For example: ++ +---- +2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn +0b1b2193-251f-4243-af39-2f99b29d18c5 | openshift-etcd/etcd | 84c99c906edd475ba19478a9a6690efd | 172.30.143.226 | ACTIVE | ovn +f05b07fc-01b7-4673-bd4d-adaa4391458e | openshift-dns-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.152.27 | ACTIVE | ovn +---- diff --git a/networking/load-balancing-openstack.adoc b/networking/load-balancing-openstack.adoc new file mode 100644 index 000000000000..966afb8209a5 --- /dev/null +++ b/networking/load-balancing-openstack.adoc @@ -0,0 +1,8 @@ +[id="load-balancing-openstack"] += Load balancing on {rh-openstack} +include::modules/common-attributes.adoc[] +:context: load-balancing-openstack + +toc::[] + +include::modules/installation-osp-kuryr-octavia-upgrade.adoc[leveloffset=+1] \ No newline at end of file From a4af1a00069992e5a56942486f91ecc2d8817ea6 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Mon, 6 Jul 2020 10:57:48 -0400 Subject: [PATCH 6/7] Reshuffling and relabeling --- .../installing-openstack-installer-kuryr.adoc | 3 +++ .../installation-osp-kuryr-octavia-configuration.adoc | 4 +--- modules/installation-osp-kuryr-octavia-upgrade.adoc | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/installing/installing_openstack/installing-openstack-installer-kuryr.adoc b/installing/installing_openstack/installing-openstack-installer-kuryr.adoc index 2529ac7b7729..c8452126f71c 100644 --- a/installing/installing_openstack/installing-openstack-installer-kuryr.adoc +++ b/installing/installing_openstack/installing-openstack-installer-kuryr.adoc @@ -22,6 +22,9 @@ include::modules/installation-osp-default-kuryr-deployment.adoc[leveloffset=+1] include::modules/installation-osp-kuryr-increase-quota.adoc[leveloffset=+2] include::modules/installation-osp-kuryr-neutron-configuration.adoc[leveloffset=+2] include::modules/installation-osp-kuryr-octavia-configuration.adoc[leveloffset=+2] + +You can xref:../../networking/load-balancing-openstack.adoc#installation-osp-kuryr-octavia-configure[configure your cluster to use the Octavia OVN driver] after your RHOSP cloud is upgraded from version 13 to version 16. + include::modules/installation-osp-kuryr-known-limitations.adoc[leveloffset=+2] include::modules/installation-osp-control-compute-machines.adoc[leveloffset=+2] include::modules/installation-osp-bootstrap-machine.adoc[leveloffset=+2] diff --git a/modules/installation-osp-kuryr-octavia-configuration.adoc b/modules/installation-osp-kuryr-octavia-configuration.adoc index 0d4762322585..51cbb4975a4c 100644 --- a/modules/installation-osp-kuryr-octavia-configuration.adoc +++ b/modules/installation-osp-kuryr-octavia-configuration.adoc @@ -239,6 +239,4 @@ If Kuryr uses `ovn` instead of Amphora, it offers the following benefits: * Decreased resource requirements. Kuryr does not require a load balancer VM for each Service. * Reduced network latency. * Increased service creation speed by using OpenFlow rules instead of a VM for each Service. -* Distributed load balancing actions across all nodes instead of centralized on Amphora VMs. - -You can link:[configure your cluster to use the Octavia OVN driver] after your {rh-openstack} cloud is upgraded from version 13 to version 16. \ No newline at end of file +* Distributed load balancing actions across all nodes instead of centralized on Amphora VMs. \ No newline at end of file diff --git a/modules/installation-osp-kuryr-octavia-upgrade.adoc b/modules/installation-osp-kuryr-octavia-upgrade.adoc index 509bebff3884..c10d0adfc45b 100644 --- a/modules/installation-osp-kuryr-octavia-upgrade.adoc +++ b/modules/installation-osp-kuryr-octavia-upgrade.adoc @@ -2,13 +2,13 @@ // // * networking/openstack/load-balancing-openstack.adoc -[id="installation-osp-kuryr-octavia-configure{context}"] -= Configuring a cluster to use the {rh-openstack} Octavia provider driver +[id="installation-osp-kuryr-octavia-configure_{context}"] += Using the Octavia OVN load balancer provider driver with Kuryr SDN If your {product-title} cluster uses Kuryr and was installed on a {rh-openstack-first} 13 cloud that was later upgraded to {rh-openstack} 16, you can configure it to use the Octavia OVN provider driver. -[IMPORTANT] +[CAUTION] ==== Kuryr replaces existing load balancers after you change provider drivers. This process results in some downtime. @@ -24,7 +24,8 @@ results in some downtime. + [TIP] ==== -To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. +To view a list of available Octavia drivers, on a command line, enter link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/loadbalancer#loadbalancer_provider_list[`openstack loadbalancer provider list`]. + You should see the `ovn` driver in the command's output. ==== @@ -95,4 +96,4 @@ The remaining load balancers should be the `ovn` type. For example: 2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn 0b1b2193-251f-4243-af39-2f99b29d18c5 | openshift-etcd/etcd | 84c99c906edd475ba19478a9a6690efd | 172.30.143.226 | ACTIVE | ovn f05b07fc-01b7-4673-bd4d-adaa4391458e | openshift-dns-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.152.27 | ACTIVE | ovn ----- +---- \ No newline at end of file From c582b35f7316e6a0316a17a8c4580c12ff16acc6 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Tue, 7 Jul 2020 15:54:03 -0400 Subject: [PATCH 7/7] Addressing peer review feedback --- .../installing-openstack-installer-kuryr.adoc | 2 +- ...installation-osp-kuryr-octavia-upgrade.adoc | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installing/installing_openstack/installing-openstack-installer-kuryr.adoc b/installing/installing_openstack/installing-openstack-installer-kuryr.adoc index c8452126f71c..2efc4daebcc9 100644 --- a/installing/installing_openstack/installing-openstack-installer-kuryr.adoc +++ b/installing/installing_openstack/installing-openstack-installer-kuryr.adoc @@ -23,7 +23,7 @@ include::modules/installation-osp-kuryr-increase-quota.adoc[leveloffset=+2] include::modules/installation-osp-kuryr-neutron-configuration.adoc[leveloffset=+2] include::modules/installation-osp-kuryr-octavia-configuration.adoc[leveloffset=+2] -You can xref:../../networking/load-balancing-openstack.adoc#installation-osp-kuryr-octavia-configure[configure your cluster to use the Octavia OVN driver] after your RHOSP cloud is upgraded from version 13 to version 16. +You can xref:../../networking/load-balancing-openstack.adoc#installation-osp-kuryr-octavia-configure[configure your cluster to use the Octavia OVN driver] after your {rh-openstack} cloud is upgraded from version 13 to version 16. include::modules/installation-osp-kuryr-known-limitations.adoc[leveloffset=+2] include::modules/installation-osp-control-compute-machines.adoc[leveloffset=+2] diff --git a/modules/installation-osp-kuryr-octavia-upgrade.adoc b/modules/installation-osp-kuryr-octavia-upgrade.adoc index c10d0adfc45b..30b05836d7a9 100644 --- a/modules/installation-osp-kuryr-octavia-upgrade.adoc +++ b/modules/installation-osp-kuryr-octavia-upgrade.adoc @@ -8,7 +8,7 @@ If your {product-title} cluster uses Kuryr and was installed on a {rh-openstack-first} 13 cloud that was later upgraded to {rh-openstack} 16, you can configure it to use the Octavia OVN provider driver. -[CAUTION] +[IMPORTANT] ==== Kuryr replaces existing load balancers after you change provider drivers. This process results in some downtime. @@ -24,9 +24,9 @@ results in some downtime. + [TIP] ==== -To view a list of available Octavia drivers, on a command line, enter link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/loadbalancer#loadbalancer_provider_list[`openstack loadbalancer provider list`]. +To view a list of available Octavia drivers, on a command line, enter `openstack loadbalancer provider list`. -You should see the `ovn` driver in the command's output. +The `ovn` driver is displayed in the command's output. ==== .Procedure @@ -51,7 +51,7 @@ metadata: ---- <1> Delete this line. The cluster will regenerate it with `ovn` as the value. + -Wait for the Cluster Network Operator detects the modification and redeploys the `kuryr-controller` and `kuryr-cni` pods. This process may take several minutes. +Wait for the Cluster Network Operator to detect the modification and to redeploy the `kuryr-controller` and `kuryr-cni` Pods. This process might take several minutes. . Verify that the `kuryr-config` ConfigMap annotation is present with `ovn` as its value. On a command line, enter: + @@ -59,7 +59,7 @@ Wait for the Cluster Network Operator detects the modification and redeploys the $ oc -n openshift-kuryr edit cm kuryr-config ---- + -The `ovn` provider value should be present in the output: +The `ovn` provider value is displayed in the output: + ---- ... @@ -72,25 +72,25 @@ metadata: . Verify that {rh-openstack} recreated its load balancers. -.. On a command line, type: +.. On a command line, enter: + ---- $ openstack loadbalancer list | grep amphora ---- + -You should see a single Amphora load balancer. For example: +A single Amphora load balancer is displayed. For example: + ---- a4db683b-2b7b-4988-a582-c39daaad7981 | ostest-7mbj6-kuryr-api-loadbalancer | 84c99c906edd475ba19478a9a6690efd | 172.30.0.1 | ACTIVE | amphora ---- -.. Then, type: +.. Search for `ovn` load balancers by entering: + ---- $ openstack loadbalancer list | grep ovn ---- + -The remaining load balancers should be the `ovn` type. For example: +The remaining load balancers of the `ovn` type are displayed. For example: + ---- 2dffe783-98ae-4048-98d0-32aa684664cc | openshift-apiserver-operator/metrics | 84c99c906edd475ba19478a9a6690efd | 172.30.167.119 | ACTIVE | ovn