From a3291c74206cb9b899f6cea764439cf380a73991 Mon Sep 17 00:00:00 2001 From: Tom Weininger Date: Wed, 13 Nov 2024 12:09:05 +0100 Subject: [PATCH] Stop/start octavia services and update docs Updates for adoption of octavia. --- .../proc_adopting-the-identity-service.adoc | 2 +- .../proc_adopting-the-loadbalancer-service.adoc | 14 ++++++++++++-- ...oc_rolling-back-the-control-plane-adoption.adoc | 8 +++++++- .../modules/proc_stopping-openstack-services.adoc | 6 ++++++ tests/roles/control_plane_rollback/tasks/main.yaml | 8 +++++++- .../roles/stop_openstack_services/tasks/main.yaml | 6 ++++++ 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/docs_user/modules/proc_adopting-the-identity-service.adoc b/docs_user/modules/proc_adopting-the-identity-service.adoc index 039723a1a..822caf8ee 100644 --- 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 index 483519253..994f7f86e 100644 --- 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 index a3802a022..bd9e293c7 100644 --- 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 index 5ad49efc4..2cc018cb0 100644 --- 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 index 11ce151f7..8e918baa6 100644 --- 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 index 1e95a5f7b..01514df19 100644 --- 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"