Stop/start octavia services and update docs

Updates for adoption of octavia.
openstack-k8s-operators · Nov 26, 2024 · a3291c7 · a3291c7
1 parent 36b4b13
commit a3291c7
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/docs_user/modules/proc_adopting-the-identity-service.adoc b/docs_user/modules/proc_adopting-the-identity-service.adoc
@@ -63,7 +63,7 @@ control plane, excluding the {identity_service} and its endpoints:
 ----
 $ openstack endpoint list | grep keystone | awk '/admin/{ print $2; }' | xargs ${BASH_ALIASES[openstack]} endpoint delete || true
 
-for service in aodh heat heat-cfn barbican cinderv3 glance gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic; do
+for service in aodh heat heat-cfn barbican cinderv3 glance gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic octavia; do
   openstack service list | awk "/ $service /{ print \$2; }" | xargs -r ${BASH_ALIASES[openstack]} service delete || true
 done
 ----

diff --git a/docs_user/modules/proc_adopting-the-loadbalancer-service.adoc b/docs_user/modules/proc_adopting-the-loadbalancer-service.adoc
@@ -34,10 +34,20 @@ Run the following command in order to enable the {loadbalancer_service} CR.
 
 [source,bash]
 ----
-$ oc patch openstackcontrolplane openstack --type=merge --patch '
+$ oc patch openstackcontrolplane openstack -n openstack --type=merge --patch '
 spec:
   octavia:
     enabled: true
-    template: {}
+    template:
+      apacheContainerImage: registry.redhat.io/rhel8/httpd-24:latest
+      amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
+      # Without this I got: MariaDB CR name is not present
+      databaseInstance: openstack
+      octaviaHealthManager:
+        networkAttachments: ["octavia"]
+      octaviaHousekeeping:
+        networkAttachments: ["octavia"]
+      octaviaWorker:
+        networkAttachments: ["octavia"]
 '
 ----
diff --git a/docs_user/modules/proc_rolling-back-the-control-plane-adoption.adoc b/docs_user/modules/proc_rolling-back-the-control-plane-adoption.adoc
@@ -56,7 +56,13 @@ ServicesToStart=("tripleo_horizon.service"
                  "tripleo_ceilometer_agent_notification.service"
                  "tripleo_ovn_cluster_north_db_server.service"
                  "tripleo_ovn_cluster_south_db_server.service"
-                 "tripleo_ovn_cluster_northd.service")
+                 "tripleo_ovn_cluster_northd.service"
+                 "tripleo_octavia_api.service"
+                 "tripleo_octavia_health_manager.service"
+                 "tripleo_octavia_rsyslog.service"
+                 "tripleo_octavia_driver_agent.service"
+                 "tripleo_octavia_housekeeping.service"
+                 "tripleo_octavia_worker.service")
 
 PacemakerResourcesToStart=("galera-bundle"
                            "haproxy-bundle"

diff --git a/docs_user/modules/proc_stopping-openstack-services.adoc b/docs_user/modules/proc_stopping-openstack-services.adoc
@@ -64,6 +64,12 @@ ServicesToStop=("tripleo_aodh_api.service"
                 "tripleo_aodh_notifier.service"
                 "tripleo_ceilometer_agent_central.service"
                 "tripleo_ceilometer_agent_notification.service"
+                "tripleo_octavia_api.service"
+                "tripleo_octavia_health_manager.service"
+                "tripleo_octavia_rsyslog.service"
+                "tripleo_octavia_driver_agent.service"
+                "tripleo_octavia_housekeeping.service"
+                "tripleo_octavia_worker.service"
                 "tripleo_horizon.service"
                 "tripleo_keystone.service"
                 "tripleo_barbican_api.service"

diff --git a/tests/roles/control_plane_rollback/tasks/main.yaml b/tests/roles/control_plane_rollback/tasks/main.yaml
@@ -44,7 +44,13 @@
                      "tripleo_ceilometer_agent_notification.service"
                      "tripleo_ovn_cluster_north_db_server.service"
                      "tripleo_ovn_cluster_south_db_server.service"
-                     "tripleo_ovn_cluster_northd.service")
+                     "tripleo_ovn_cluster_northd.service"
+                     "tripleo_octavia_api.service"
+                     "tripleo_octavia_health_manager.service"
+                     "tripleo_octavia_rsyslog.service"
+                     "tripleo_octavia_driver_agent.service"
+                     "tripleo_octavia_housekeeping.service"
+                     "tripleo_octavia_worker.service")
 
     PacemakerResourcesToStart=("galera-bundle"
                                "haproxy-bundle"

diff --git a/tests/roles/stop_openstack_services/tasks/main.yaml b/tests/roles/stop_openstack_services/tasks/main.yaml
@@ -20,6 +20,12 @@
                     "tripleo_aodh_notifier.service"
                     "tripleo_ceilometer_agent_central.service"
                     "tripleo_ceilometer_agent_notification.service"
+                    "tripleo_octavia_api.service"
+                    "tripleo_octavia_health_manager.service"
+                    "tripleo_octavia_rsyslog.service"
+                    "tripleo_octavia_driver_agent.service"
+                    "tripleo_octavia_housekeeping.service"
+                    "tripleo_octavia_worker.service"
                     "tripleo_horizon.service"
                     "tripleo_keystone.service"
                     "tripleo_barbican_api.service"