From 40467b0f3f187148b2b20562af56c0bbddca3a77 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Tue, 21 May 2019 14:41:56 +0200 Subject: [PATCH] [Rocky/Queens Only] Remove pre-upgrade validation tasks in cont services. The pre-upgrade validation tasks in the containerized services made sense when upgrading from non-containerized to containerized overcloud (ocata to pike), however we kept them for queens and rocky release thinking about using them during the undercloud upgrade from non-containerized to containerized (queens to rocky) but they were skipped there too [0]. It's beeing observed in the current upgrades taken place by operators, that these validations are causing more issues than it was thought, so let's get rid of them from all the containerized services in Queens and Rocky. Closes-Bug: #1829858 [0] - https://github.com/openstack/python-tripleoclient/blob/stable/rocky/tripleoclient/v1/tripleo_deploy.py#L833 Change-Id: If99ea62b6cefb140a9c918b8f6a774658c52d54b (cherry picked from commit 7e0a4d0e5282e5e3bcced9368c724ffd6042643f) --- docker/services/aodh-api.yaml | 6 ------ docker/services/aodh-evaluator.yaml | 4 ---- docker/services/aodh-listener.yaml | 4 ---- docker/services/aodh-notifier.yaml | 4 ---- docker/services/barbican-api.yaml | 3 --- docker/services/ceilometer-agent-central.yaml | 4 ---- docker/services/ceilometer-agent-compute.yaml | 8 -------- docker/services/ceilometer-agent-ipmi.yaml | 4 ---- docker/services/ceilometer-agent-notification.yaml | 4 ---- docker/services/cinder-api.yaml | 4 ---- docker/services/cinder-backup.yaml | 4 ---- docker/services/cinder-scheduler.yaml | 4 ---- docker/services/cinder-volume.yaml | 4 ---- docker/services/collectd.yaml | 4 ---- docker/services/congress.yaml | 4 ---- docker/services/database/mongodb.yaml | 4 ---- docker/services/database/mysql.yaml | 4 ---- docker/services/database/redis.yaml | 4 ---- docker/services/ec2-api.yaml | 8 -------- docker/services/etcd.yaml | 4 ---- docker/services/glance-api.yaml | 4 ---- docker/services/gnocchi-api.yaml | 11 ----------- docker/services/gnocchi-metricd.yaml | 4 ---- docker/services/gnocchi-statsd.yaml | 4 ---- docker/services/haproxy.yaml | 1 + docker/services/heat-api-cfn.yaml | 11 ----------- docker/services/heat-api.yaml | 11 ----------- docker/services/heat-engine.yaml | 4 ---- docker/services/horizon.yaml | 5 ----- docker/services/ironic-api.yaml | 11 ----------- docker/services/ironic-conductor.yaml | 4 ---- docker/services/ironic-inspector.yaml | 4 ---- docker/services/iscsid.yaml | 8 -------- docker/services/keepalived.yaml | 4 ---- docker/services/keystone.yaml | 6 ------ docker/services/manila-api.yaml | 4 ---- docker/services/manila-scheduler.yaml | 4 ---- docker/services/manila-share.yaml | 4 ---- docker/services/memcached.yaml | 4 ---- docker/services/mistral-api.yaml | 11 ----------- docker/services/mistral-engine.yaml | 4 ---- docker/services/mistral-event-engine.yaml | 4 ---- docker/services/mistral-executor.yaml | 4 ---- docker/services/multipathd.yaml | 4 ---- docker/services/neutron-api.yaml | 4 ---- docker/services/neutron-dhcp.yaml | 4 ---- docker/services/neutron-l3.yaml | 4 ---- docker/services/neutron-metadata.yaml | 4 ---- docker/services/neutron-ovs-agent.yaml | 4 ---- docker/services/neutron-sriov-agent.yaml | 4 ---- docker/services/nova-api.yaml | 11 ----------- docker/services/nova-compute.yaml | 4 ---- docker/services/nova-conductor.yaml | 4 ---- docker/services/nova-consoleauth.yaml | 4 ---- docker/services/nova-ironic.yaml | 4 ---- docker/services/nova-libvirt.yaml | 4 ---- docker/services/nova-metadata.yaml | 4 ---- docker/services/nova-placement.yaml | 6 ------ docker/services/nova-scheduler.yaml | 4 ---- docker/services/nova-vnc-proxy.yaml | 4 ---- docker/services/octavia-api.yaml | 10 ---------- docker/services/octavia-health-manager.yaml | 4 ---- docker/services/octavia-housekeeping.yaml | 4 ---- docker/services/octavia-worker.yaml | 4 ---- docker/services/opendaylight-api.yaml | 4 ---- docker/services/ovn-controller.yaml | 4 ---- docker/services/ovn-dbs.yaml | 4 ---- docker/services/ovn-metadata.yaml | 4 ---- docker/services/rabbitmq.yaml | 4 ---- docker/services/sahara-api.yaml | 4 ---- docker/services/sahara-engine.yaml | 4 ---- docker/services/sensu-client.yaml | 4 ---- docker/services/swift-proxy.yaml | 5 ----- docker/services/swift-storage.yaml | 5 ----- docker/services/tacker.yaml | 4 ---- docker/services/zaqar.yaml | 6 ------ 76 files changed, 1 insertion(+), 370 deletions(-) diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml index f7b724dc45..c10e04a8aa 100644 --- a/docker/services/aodh-api.yaml +++ b/docker/services/aodh-api.yaml @@ -191,12 +191,6 @@ outputs: set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if aodh api is running" - shell: systemctl status 'httpd' | grep -q aodh - tags: validation - when: - - aodh_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable aodh service (running under httpd) diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index e6763c430c..1328be6225 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -137,10 +137,6 @@ outputs: - name: Set fact aodh_evaluator_enabled set_fact: aodh_evaluator_enabled: "{{ aodh_evaluator_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-aodh-evaluator is running" - command: systemctl is-active --quiet openstack-aodh-evaluator - tags: validation - when: aodh_evaluator_enabled|bool - when: step|int == 2 block: - name: Stop and disable openstack-aodh-evaluator service diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index ae2fe31bb2..e7ab4ded60 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -144,10 +144,6 @@ outputs: - name: Set fact aodh_listener_enabled set_fact: aodh_listener_enabled: "{{ aodh_listener_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running" - command: systemctl is-active --quiet openstack-aodh-listener - when: aodh_listener_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable openstack-aodh-listener service diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index b8d41a5346..e7df680a85 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -144,10 +144,6 @@ outputs: - name: Set fact aodh_notifier_enabled set_fact: aodh_notifier_enabled: "{{ aodh_notifier_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-aodh-notifier is running" - command: systemctl is-active --quiet openstack-aodh-notifier - when: aodh_notifier_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable openstack-aodh-notifier service diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index ae988065e7..acde36c731 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -255,9 +255,6 @@ outputs: - name: Set fact barbican_enabled set_fact: barbican_enabled: "{{ barbican_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service barbican-api is running" - command: systemctl is-active --quiet openstack-barbican-api - when: barbican_enabled|bool - when: step|int == 2 block: - name: Stop and disable barbican_api service diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index 8277491572..c66f601af3 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -153,10 +153,6 @@ outputs: - name: Set fact ceilometer_agent_central_enabled set_fact: ceilometer_agent_central_enabled: "{{ ceilometer_agent_central_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running" - command: systemctl is-active --quiet openstack-ceilometer-central - when: ceilometer_agent_central_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ceilometer agent central service diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index 6607065478..3287fe2003 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -131,14 +131,6 @@ outputs: - name: Set fact openstack_ceilometer_polling_enabled set_fact: openstack_ceilometer_polling_enabled: "{{ openstack_ceilometer_polling_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running" - command: systemctl is-active --quiet openstack-ceilometer-compute - when: openstack_ceilometer_compute_enabled|bool - tags: validation - - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-polling is running" - command: systemctl is-active --quiet openstack-ceilometer-polling - when: openstack_ceilometer_polling_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ceilometer compute agent diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index 4efd12c992..77b03bc6e0 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.yaml @@ -132,10 +132,6 @@ outputs: - name: Set fact ceilometer_ipmi_enabled set_fact: ceilometer_ipmi_enabled: "{{ ceilometer_ipmi_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-ceilometer-ipmi is running" - command: systemctl is-active --quiet openstack-ceilometer-ipmi - when: ceilometer_ipmi_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ceilometer agent ipmi service diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index f774dc1dce..683383bcdc 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -159,10 +159,6 @@ outputs: - name: Set fact ceilometer_agent_notification_enabled set_fact: ceilometer_agent_notification_enabled: "{{ ceilometer_agent_notification_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-notification is running" - command: systemctl is-active --quiet openstack-ceilometer-notification - when: ceilometer_agent_notification_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ceilometer agent notification service diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 0fcb2efdb1..eea13b8e00 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -252,10 +252,6 @@ outputs: - name: Set fact cinder_api_enabled set_fact: cinder_api_enabled: "{{ cinder_api_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-cinder-api is running" - shell: systemctl is-active --quiet openstack-cinder-api - when: cinder_api_enabled|bool - tags: validation # NOTE: In puppet service variant, we ran release N online # migrations before upgrade to release N+1. In docker # service variant, we run release N online migrations diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 4549c703ec..33efbe3f51 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -183,10 +183,6 @@ outputs: - name: Set fact cinder_backup_enabled set_fact: cinder_backup_enabled: "{{ cinder_backup_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-cinder-backup is running" - shell: systemctl is-active --quiet openstack-cinder-backup - when: cinder_backup_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable cinder_backup service diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index 024c95833d..8cc8eb4866 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -150,10 +150,6 @@ outputs: - name: Set fact cinder_scheduler_enabled set_fact: cinder_scheduler_enabled: "{{ cinder_scheduler_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-cinder-scheduler is running" - shell: systemctl is-active --quiet openstack-cinder-scheduler - when: cinder_scheduler_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable cinder_scheduler service diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 6654c77812..a8c867f1b4 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -170,10 +170,6 @@ outputs: - name: Set fact cinder_volume_enabled set_fact: cinder_volume_enabled: "{{ cinder_volume_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-cinder-volume is running" - shell: systemctl is-active --quiet openstack-cinder-volume - when: cinder_volume_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable cinder_volume service diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml index 9644579ac7..4c8b17b41f 100644 --- a/docker/services/collectd.yaml +++ b/docker/services/collectd.yaml @@ -142,10 +142,6 @@ outputs: - name: Set fact collectd_enabled set_fact: collectd_enabled: "{{ collectd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service collectd service is running" - command: systemctl is-active --quiet collectd - when: collectd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable collectd service diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index 933c014a7f..30a4c36988 100644 --- a/docker/services/congress.yaml +++ b/docker/services/congress.yaml @@ -162,10 +162,6 @@ outputs: - name: Set fact congress_enabled set_fact: congress_enabled: "{{ congress_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-congress-server is running" - command: systemctl is-active --quiet openstack-congress-server - when: congress_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable congress_api service diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index af5bade954..23c3c63cf9 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -177,10 +177,6 @@ outputs: - name: Set fact mongod_enabled set_fact: mongod_enabled: "{{ mongod_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if mongod is running" - command: systemctl is-active --quiet mongod - when: mongod_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable mongodb service diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index b902a13e03..2fdc6529ec 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -256,10 +256,6 @@ outputs: - name: Set fact mariadb_enabled set_fact: mariadb_enabled: "{{ mariadb_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if mysql service is running" - command: systemctl is-active --quiet mariadb - when: mariadb_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable mysql service diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml index eed9763b33..9a1ce92276 100644 --- a/docker/services/database/redis.yaml +++ b/docker/services/database/redis.yaml @@ -199,10 +199,6 @@ outputs: - name: Set fact redis_enabled set_fact: redis_enabled: "{{ redis_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if redis is running" - command: systemctl is-active --quiet redis - when: redis_enabled|bool - tags: validation - when: - step|int == 2 - redis_enabled|bool diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 91ea806b57..c32bcefe3b 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -225,14 +225,6 @@ outputs: - name: Set fact ec2_api_metadata_enabled set_fact: ec2_api_metadata_enabled: "{{ ec2_api_metadata_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running" - command: systemctl is-active --quiet openstack-ec2-api - when: ec2_api_enabled|bool - tags: validation - - name: "PreUpgrade step0,validation: Check if openstack-ec2-metadata-api is running" - command: systemctl is-active --quiet openstack-ec2-api-metadata - when: ec2_api_metadata_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable EC2-API service diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml index 7f5be15f6e..4d930d5f9e 100644 --- a/docker/services/etcd.yaml +++ b/docker/services/etcd.yaml @@ -127,10 +127,6 @@ outputs: - name: Set fact etcd_enabled set_fact: etcd_enabled: "{{ etcd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if etcd is running" - command: systemctl is-active --quiet etcd - when: etcd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable etcd service diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 0e2aca1882..4152b82999 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -262,10 +262,6 @@ outputs: - name: Set fact glance_api_enabled set_fact: glance_api_enabled: "{{ glance_api_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-glance-api is running" - command: systemctl is-active --quiet openstack-glance-api - tags: validation - when: glance_api_enabled|bool - when: step|int == 2 block: - name: Stop and disable glance_api service diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index d9e4304906..61a6dacf85 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -239,11 +239,6 @@ outputs: - name: Set fact gnocchi_api_enabled set_fact: gnocchi_api_enabled: "{{ gnocchi_api_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-gnocchi-api is running" - command: systemctl is-active --quiet openstack-gnocchi-api - when: - - gnocchi_api_enabled|bool - tags: validation - name: Check if httpd service is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -260,12 +255,6 @@ outputs: - name: set fact gnocchi_httpd_enabled set_fact: gnocchi_httpd_enabled: "{{ gnocchi_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if gnocchi_api_wsgi is running" - shell: systemctl status 'httpd' | grep -q gnocchi - tags: validation - when: - - gnocchi_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable gnocchi_api service diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index bda7e3cb76..7768c52025 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/docker/services/gnocchi-metricd.yaml @@ -169,10 +169,6 @@ outputs: - name: Set fact gnocchi_metricd_enabled set_fact: gnocchi_metricd_enabled: "{{ gnocchi_metricd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-gnocchi-metricd is running" - command: systemctl is-active --quiet openstack-gnocchi-metricd - when: gnocchi_metricd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable openstack-gnocchi-metricd service diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index 77cf2168fd..c28d344124 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/docker/services/gnocchi-statsd.yaml @@ -169,10 +169,6 @@ outputs: - name: Set fact gnocchi_statsd_enabled set_fact: gnocchi_statsd_enabled: "{{ gnocchi_statsd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-gnocchi-statsd is running" - command: systemctl is-active --quiet openstack-gnocchi-statsd - when: gnocchi_statsd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable openstack-gnocchi-statsd service diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index bd6dfd441d..7b7b132272 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -253,6 +253,7 @@ outputs: - null environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS + upgrade_tasks: [] host_prep_tasks: - name: Check if rsyslog exists shell: systemctl is-active rsyslog diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index 76cc244458..53b2a227c1 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -145,11 +145,6 @@ outputs: register: heat_api_cfn_httpd_enabled_result - set_fact: heat_api_cfn_httpd_enabled: "{{ heat_api_cfn_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-heat-api-cfn is running" - command: systemctl is-active --quiet openstack-heat-api-cfn - when: - - heat_api_cfn_enabled|bool - tags: validation - name: Check if httpd service is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -158,12 +153,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if heat_api_cfn_wsgi is running" - tags: validation - shell: systemctl status 'httpd' | grep -q heat_api_cfn_wsgi - when: - - heat_api_cfn_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable heat_api_cfn service (pre-upgrade not under httpd) diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 1a426931a2..4f82b5b1a6 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -183,11 +183,6 @@ outputs: register: heat_api_httpd_enabled_result - set_fact: heat_api_httpd_enabled: "{{ heat_api_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-heat-api is running" - command: systemctl is-active --quiet openstack-heat-api - when: - - heat_api_enabled|bool - tags: validation - name: Check if httpd is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -196,12 +191,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if heat_api_wsgi is running" - shell: systemctl status 'httpd' | grep -q heat_api_wsgi - tags: validation - when: - - heat_api_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable heat_api service (pre-upgrade not under httpd) diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index bd487ebea6..8156652b68 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -163,10 +163,6 @@ outputs: - name: Set fact heat_engine_enabled set_fact: heat_engine_enabled: "{{ heat_engine_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-heat-engine is running" - command: systemctl is-active --quiet openstack-heat-engine - when: heat_engine_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable heat_engine service diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml index 57c4c54292..85792038d4 100644 --- a/docker/services/horizon.yaml +++ b/docker/services/horizon.yaml @@ -198,11 +198,6 @@ outputs: register: horizon_httpd_enabled_result - set_fact: horizon_httpd_enabled: "{{ horizon_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if horizon is running" - shell: systemctl is-active --quiet httpd - when: - - horizon_httpd_enabled|bool - tags: validation - name: Stop and disable horizon service (running under httpd) when: - step|int == 2 diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml index b973de9949..dc801db957 100644 --- a/docker/services/ironic-api.yaml +++ b/docker/services/ironic-api.yaml @@ -225,11 +225,6 @@ outputs: - name: Set fact ironic_httpd_enabled set_fact: ironic_httpd_enabled: "{{ ironic_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ironic-api is running" - command: systemctl is-active --quiet openstack-ironic-api - when: - - ironic_api_enabled|bool - tags: validation - name: Check if httpd service is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -239,12 +234,6 @@ outputs: set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if ironic_api_wsgi is running" - shell: systemctl status 'httpd' | grep -q ironic - tags: validation - when: - - ironic_httpd_enabled|bool - - httpd_running|bool # NOTE: In puppet service variant, we ran release N online # migrations before upgrade to release N+1. In docker # service variant, we run release N online migrations diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 4c666fd816..670f22172e 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -188,10 +188,6 @@ outputs: - name: Set fact ironic_conductor_enabled set_fact: ironic_conductor_enabled: "{{ ironic_conductor_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ironic-conductor is running" - command: systemctl is-active --quiet openstack-ironic-conductor - tags: validation - when: ironic_conductor_enabled|bool - when: step|int == 2 block: - name: Stop and disable ironic_conductor service diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml index bd5677361f..d3e1a40fb6 100644 --- a/docker/services/ironic-inspector.yaml +++ b/docker/services/ironic-inspector.yaml @@ -192,10 +192,6 @@ outputs: - name: Set fact ironic_inspector_enabled set_fact: ironic_inspector_enabled: "{{ ironic_inspector_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-ironic-inspector is running" - command: systemctl is-active --quiet openstack-ironic-inspector - tags: validation - when: ironic_inspector_enabled|bool - when: step|int == 2 block: - name: Stop and disable ironic_inspector service diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index 463eca0bf2..6fe3b0beec 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -123,10 +123,6 @@ outputs: - name: Set fact iscsid_enabled set_fact: iscsid_enabled: "{{ iscsid_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if iscsid is running" - command: systemctl is-active --quiet iscsid - when: iscsid_enabled|bool - tags: validation - name: Check if iscsid.socket service is deployed command: systemctl is-enabled --quiet iscsid.socket ignore_errors: True @@ -134,10 +130,6 @@ outputs: - name: Set fact iscsid_socket_enabled set_fact: iscsid_socket_enabled: "{{ iscsid_socket_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if iscsid.socket is running" - command: systemctl is-active --quiet iscsid.socket - when: iscsid_socket_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable iscsid service diff --git a/docker/services/keepalived.yaml b/docker/services/keepalived.yaml index 6707da7a97..8d871d1308 100644 --- a/docker/services/keepalived.yaml +++ b/docker/services/keepalived.yaml @@ -128,10 +128,6 @@ outputs: - name: Set fact keepalived_enabled set_fact: keepalived_enabled: "{{ keepalived_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service keepalived is running" - command: systemctl is-active --quiet keepalived - when: keepalived_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable keepalived service diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 10a17aeba9..fe3ffb0114 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -230,12 +230,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if keystone_wsgi is running under httpd" - shell: systemctl status 'httpd' | grep -q keystone - tags: validation - when: - - keystone_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable keystone service (running under httpd) diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml index 555ac193f9..ac4c0191d4 100644 --- a/docker/services/manila-api.yaml +++ b/docker/services/manila-api.yaml @@ -176,10 +176,6 @@ outputs: - name: Set fact manila_api_enabled set_fact: manila_api_enabled: "{{ manila_api_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-manila-api is running" - command: systemctl is-active --quiet openstack-manila-api - when: manila_api_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable manila_api service diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index a95eae0d58..d62ef10354 100644 --- a/docker/services/manila-scheduler.yaml +++ b/docker/services/manila-scheduler.yaml @@ -135,10 +135,6 @@ outputs: - name: Set fact manila_scheduler_enabled set_fact: manila_scheduler_enabled: "{{ manila_scheduler_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-manila-scheduler is running" - command: systemctl is-active --quiet openstack-manila-scheduler - when: manila_scheduler_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable manila_scheduler service diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index 4a9d9ebef8..bf18d61d45 100644 --- a/docker/services/manila-share.yaml +++ b/docker/services/manila-share.yaml @@ -153,10 +153,6 @@ outputs: - name: Set fact manila_scheduler_enabled set_fact: manila_scheduler_enabled: "{{ manila_scheduler_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-manila-scheduler is running" - command: systemctl is-active --quiet openstack-manila-scheduler - when: manila_scheduler_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable manila_scheduler service diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml index 6d8d6f9f3d..ea644a0638 100644 --- a/docker/services/memcached.yaml +++ b/docker/services/memcached.yaml @@ -113,10 +113,6 @@ outputs: - name: Set fact memcached_enabled set_fact: memcached_enabled: "{{ memcached_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service memcached is running" - command: systemctl is-active --quiet memcached - when: memcached_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable memcached service diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index 481f0992c8..81afbff833 100644 --- a/docker/services/mistral-api.yaml +++ b/docker/services/mistral-api.yaml @@ -223,17 +223,6 @@ outputs: register: mistral_httpd_enabled_result - set_fact: mistral_httpd_enabled: "{{ mistral_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-mistral-api is running" - command: systemctl is-active --quiet openstack-mistral-api - when: - - mistral_api_enabled|bool - tags: validation - - name: "PreUpgrade step0,validation: Check if mistral_api_wsgi is running" - shell: systemctl status 'httpd' | grep -q mistral - tags: validation - when: - - mistral_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable mistral_api service (pre-upgrade not under httpd) diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index c4213c257e..11ce1197c9 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -142,10 +142,6 @@ outputs: - name: Set fact mistral_engine_enabled set_fact: mistral_engine_enabled: "{{ mistral_engine_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-mistral-engine is running" - command: systemctl is-active --quiet openstack-mistral-engine - when: mistral_engine_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable mistral_engine service diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml index 95d50188c0..ec230a756c 100644 --- a/docker/services/mistral-event-engine.yaml +++ b/docker/services/mistral-event-engine.yaml @@ -142,10 +142,6 @@ outputs: - name: Set fact mistral_event_engine_enabled set_fact: mistral_event_engine_enabled: "{{ mistral_event_engine_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-mistral-event-engine is running" - command: systemctl is-active --quiet openstack-mistral-event-engine - when: mistral_event_engine_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable mistral_event_engine service diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index ec195b4d62..53dad925a9 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -150,10 +150,6 @@ outputs: - name: Set fact mistral_executor_enabled set_fact: mistral_executor_enabled: "{{ mistral_executor_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if openstack-mistral-executor is running" - command: systemctl is-active --quiet openstack-mistral-executor - when: mistral_executor_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable mistral_executor service diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml index 738d8038fc..bf7ec6beec 100644 --- a/docker/services/multipathd.yaml +++ b/docker/services/multipathd.yaml @@ -99,10 +99,6 @@ outputs: - name: Set fact multipathd_enabled set_fact: multipathd_enabled: "{{ multipathd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service multipathd is running" - command: systemctl is-active --quiet multipathd - when: multipathd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable multipathd service diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index d5df86af71..ed7c9c8d3c 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -199,10 +199,6 @@ outputs: - name: Set fact neutron_server_enabled set_fact: neutron_server_enabled: "{{ neutron_server_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-server is running" - command: systemctl is-active --quiet neutron-server - when: neutron_server_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_api service diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index a7a60c4966..7d84da9910 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -232,10 +232,6 @@ outputs: - name: Set fact neutron_dhcp_agent_enabled set_fact: neutron_dhcp_agent_enabled: "{{ neutron_dhcp_agent_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-dhcp-agent is running" - command: systemctl is-active --quiet neutron-dhcp-agent - when: neutron_dhcp_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_dhcp service diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index d99b8ababf..d14933c49a 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -235,10 +235,6 @@ outputs: - name: Set fact neutron_l3_agent_enabled set_fact: neutron_l3_agent_enabled: "{{ neutron_l3_agent_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running" - command: systemctl is-active --quiet neutron-l3-agent - when: neutron_l3_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_l3 service diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index fa84104f56..9d8d5b80de 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -143,10 +143,6 @@ outputs: - name: Set fact neutron_metadata_agent_enabled set_fact: neutron_metadata_agent_enabled: "{{ neutron_metadata_agent_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-metadata-agent is running" - command: systemctl is-active --quiet neutron-metadata-agent - when: neutron_metadata_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_metadata service diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 04049ce42a..e1f944f926 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -210,10 +210,6 @@ outputs: - name: Set fact neutron_ovs_agent_enabled set_fact: neutron_ovs_agent_enabled: "{{ neutron_ovs_agent_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running" - command: systemctl is-active --quiet neutron-openvswitch-agent - when: neutron_ovs_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_ovs_agent service diff --git a/docker/services/neutron-sriov-agent.yaml b/docker/services/neutron-sriov-agent.yaml index 658eb193d9..13e45072de 100644 --- a/docker/services/neutron-sriov-agent.yaml +++ b/docker/services/neutron-sriov-agent.yaml @@ -128,10 +128,6 @@ outputs: - name: Set fact neutron_sriov_nic_agent_enabled set_fact: neutron_sriov_nic_agent_enabled: "{{ neutron_sriov_nic_agent_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service neutron-sriov-nic-agent is running" - command: systemctl is-active --quiet neutron-sriov-nic-agent - when: neutron_sriov_nic_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable neutron_sriov_agent service diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 8ea1a959c6..eafb26c449 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -283,11 +283,6 @@ outputs: register: nova_api_httpd_enabled_result - set_fact: nova_api_httpd_enabled: "{{ nova_api_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-api is running" - command: systemctl is-active --quiet openstack-nova-api - tags: validation - when: - - nova_api_enabled|bool - name: Check if httpd service is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -296,12 +291,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if nova_wsgi is running" - tags: validation - shell: systemctl status 'httpd' | grep -q 'nova' - when: - - nova_api_httpd_enabled|bool - - httpd_running|bool # NOTE: In puppet service variant, we ran release N online # migrations before upgrade to release N+1. In docker # service variant, we run release N online migrations diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index eb2dc9a8ea..2efe633eea 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -334,10 +334,6 @@ outputs: - name: Set fact nova_compute_enabled set_fact: nova_compute_enabled: "{{ nova_compute_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-compute is running" - command: systemctl is-active --quiet openstack-nova-compute - tags: validation - when: nova_compute_enabled|bool - when: step|int == 1 block: - name: Set compute upgrade level to auto diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 2cee727757..e1733e6191 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -145,10 +145,6 @@ outputs: - name: Set fact nova_conductor_enabled set_fact: nova_conductor_enabled: "{{ nova_conductor_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-conductor is running" - command: systemctl is-active --quiet openstack-nova-conductor - tags: validation - when: nova_conductor_enabled|bool - when: step|int == 1 block: - name: Set compute upgrade level to auto diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 67e85370ef..9a262b46e0 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -140,10 +140,6 @@ outputs: - name: Set fact nova_consoleauth_enabled set_fact: nova_consoleauth_enabled: "{{ nova_consoleauth_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-consoleauth is running" - command: systemctl is-active --quiet openstack-nova-consoleauth - tags: validation - when: nova_consoleauth_enabled|bool - when: step|int == 2 block: - name: Stop and disable nova_consoleauth service diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index c601ca95bc..e427cebe57 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -204,10 +204,6 @@ outputs: - name: Set fact nova_ironic_enabled set_fact: nova_ironic_enabled: "{{ nova_ironic_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-compute is running" - command: systemctl is-active --quiet openstack-nova-compute - tags: validation - when: nova_ironic_enabled|bool - when: step|int == 2 block: - name: Stop and disable nova-compute service diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index fd65857ed7..f52e32a563 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -450,10 +450,6 @@ outputs: - name: Set fact nova_libvirt_enabled set_fact: nova_libvirt_enabled: "{{ nova_libvirt_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service libvirtd is running" - command: systemctl is-active --quiet libvirtd - tags: validation - when: nova_libvirt_enabled|bool - when: step|int == 2 block: - name: Stop and disable libvirtd service diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index e98f01289e..ff6f78d813 100644 --- a/docker/services/nova-metadata.yaml +++ b/docker/services/nova-metadata.yaml @@ -128,10 +128,6 @@ outputs: - name: Set fact nova_metadata_enabled set_fact: nova_metadata_enabled: "{{ nova_metadata_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-api is running" - command: systemctl is-active --quiet openstack-nova-api - tags: validation - when: nova_metadata_enabled|bool - when: step|int == 2 block: - name: Stop and disable nova_api service diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 5ff32d6c27..32e1043da7 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -157,12 +157,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if placement_wsgi is running" - shell: systemctl status 'httpd' | grep -q placement_wsgi - tags: validation - when: - - nova_placement_httpd_enabled|bool - - httpd_running|bool - when: step|int == 2 block: - name: Stop and disable nova_placement service (running under httpd) diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 1f5ae019e8..7669fec966 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -141,10 +141,6 @@ outputs: - name: Set fact nova_scheduler_enabled set_fact: nova_scheduler_enabled: "{{ nova_scheduler_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-scheduler is running" - command: systemctl is-active --quiet openstack-nova-scheduler - tags: validation - when: nova_scheduler_enabled|bool - when: step|int == 2 block: - name: Stop and disable nova_scheduler service diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index 50094f94b3..052f1e37aa 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -199,10 +199,6 @@ outputs: - name: Set fact nova_vncproxy_enabled set_fact: nova_vncproxy_enabled: "{{ nova_vncproxy_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-nova-novncproxy is running" - command: systemctl is-active --quiet openstack-nova-novncproxy - tags: validation - when: nova_vncproxy_enabled|bool - when: step|int == 2 block: - name: Stop and disable nova_vnc_proxy service diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml index 6090623ffc..4da8b26bb5 100644 --- a/docker/services/octavia-api.yaml +++ b/docker/services/octavia-api.yaml @@ -224,10 +224,6 @@ outputs: - name: Set fact octavia_api_httpd_enabled set_fact: octavia_api_httpd_enabled: "{{ octavia_api_httpd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-octavia-api is running" - command: systemctl is-active --quiet openstack-octavia-api - tags: validation - when: octavia_api_enabled|bool - name: Check if httpd service is running command: systemctl is-active --quiet httpd ignore_errors: True @@ -237,12 +233,6 @@ outputs: set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if octavia_api_cfn_wsgi is running" - tags: validation - when: - - octavia_api_httpd_enabled|bool - - httpd_running|bool - shell: systemctl status 'httpd' | grep -q 'octavia' - when: step|int == 2 block: - name: Stop and disable octavia_api service diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index f27c4f3a91..2475b85a15 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.yaml @@ -149,10 +149,6 @@ outputs: - name: Set fact octavia_health_enabled set_fact: octavia_health_enabled: "{{ octavia_health_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-octavia-health-manager is running" - command: systemctl is-active --quiet openstack-octavia-health-manager - tags: validation - when: octavia_health_enabled|bool - when: step|int == 2 block: - name: Stop and disable octavia_health_manager service diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 13af7ed086..8690f044a0 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/docker/services/octavia-housekeeping.yaml @@ -145,10 +145,6 @@ outputs: - name: Set fact octavia_housekeeping_enabled set_fact: octavia_housekeeping_enabled: "{{ octavia_housekeeping_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-octavia-housekeeping is running" - command: systemctl is-active --quiet openstack-octavia-housekeeping - when: octavia_housekeeping_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable octavia_housekeeping service diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index 465c4ec76a..7c54f3e6d0 100644 --- a/docker/services/octavia-worker.yaml +++ b/docker/services/octavia-worker.yaml @@ -164,10 +164,6 @@ outputs: - name: Set fact octavia_worker_enabled set_fact: octavia_worker_enabled: "{{ octavia_worker_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-octavia-worker is running" - command: systemctl is-active --quiet openstack-octavia-worker - when: octavia_worker_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable octavia_worker service diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index 8a09da186a..10496bdd12 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -180,10 +180,6 @@ outputs: - name: Set fact opendaylight_enabled set_fact: opendaylight_enabled: "{{ opendaylight_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service opendaylight is running" - command: systemctl is-active --quiet opendaylight - when: opendaylight_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable opendaylight_api service diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml index f7d257fd32..f6253835f0 100644 --- a/docker/services/ovn-controller.yaml +++ b/docker/services/ovn-controller.yaml @@ -145,10 +145,6 @@ outputs: - name: Set fact ovn_controller_enabled set_fact: ovn_controller_enabled: "{{ ovn_controller_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service ovn_controller is running" - command: systemctl is-active --quiet ovn-controller - when: ovn_controller_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ovn-controller service diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml index ea5113b7d2..98aa46b484 100644 --- a/docker/services/ovn-dbs.yaml +++ b/docker/services/ovn-dbs.yaml @@ -217,10 +217,6 @@ outputs: - name: Set fact ovn_northd_enabled set_fact: ovn_northd_enabled: "{{ ovn_northd_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service ovn_northd is running" - command: systemctl is-active --quiet ovn-northd - when: ovn_northd_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable ovn-northd service diff --git a/docker/services/ovn-metadata.yaml b/docker/services/ovn-metadata.yaml index 4ad07225ef..95dfb9b70a 100644 --- a/docker/services/ovn-metadata.yaml +++ b/docker/services/ovn-metadata.yaml @@ -196,10 +196,6 @@ outputs: - name: Set fact networking_ovn_metadata_agent_enabled set_fact: networking_ovn_metadata_agent_enabled: "{{ networking_ovn_metadata_agent_enabled.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running" - command: systemctl is-active --quiet networking-ovn-metadata-agent - when: networking_ovn_metadata_agent_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable networking_ovn_metadata service diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index 681b550e05..714408d9d9 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -237,10 +237,6 @@ outputs: - name: Set fact rabbitmq_enabled set_fact: rabbitmq_enabled: "{{ rabbitmq_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service rabbitmq server is running" - command: systemctl is-active --quiet rabbitmq-server - when: rabbitmq_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable rabbitmq service diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml index 383146a5e1..c5b16fb56b 100644 --- a/docker/services/sahara-api.yaml +++ b/docker/services/sahara-api.yaml @@ -156,10 +156,6 @@ outputs: - name: Set fact sahara_api_enabled set_fact: sahara_api_enabled: "{{ sahara_api_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-sahara-api is running" - command: systemctl is-active --quiet openstack-sahara-api - when: sahara_api_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable sahara_api service diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index 367136efc9..d30029bdbc 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -148,10 +148,6 @@ outputs: - name: Set fact sahara_engine_enabled set_fact: sahara_engine_enabled: "{{ sahara_engine_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check service openstack-sahara-engine is running" - command: systemctl is-active --quiet openstack-sahara-engine - when: sahara_engine_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable sahara_engine service diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml index 8a858c1bf8..6ec022e410 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -177,10 +177,6 @@ outputs: - name: Set fact sensu_enabled set_fact: sensu_enabled: "{{ sensu_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if sensu client is running" - command: systemctl is-active --quiet sensu-client - when: sensu_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable sensu-client service diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index c716e29975..4e55e78258 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -267,11 +267,6 @@ outputs: - name: Set fact swift_proxy_services_enabled set_fact: swift_proxy_services_enabled: "{{ swift_proxy_services_enabled_result }}" - - name: "PreUpgrade step0,validation: Check service openstack-swift-proxy and openstack-swift-object-expirer are running" - command: systemctl is-active --quiet "{{ item.item }}" - when: item.rc == 0 - tags: validation - with_items: "{{ swift_proxy_services_enabled.results }}" - when: step|int == 2 block: - name: Stop and disable swift-proxy and swift-object-expirer services diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 5573ec9b0f..2a4093b229 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -511,11 +511,6 @@ outputs: - name: Set fact swift_services_enabled set_fact: swift_services_enabled: "{{ swift_services_enabled_result }}" - - name: "PreUpgrade step0,validation: Check swift storage services are running" - command: systemctl is-active --quiet "{{ item.item }}" - tags: validation - with_items: "{{ swift_services_enabled.results }}" - when: item.rc == 0 - when: step|int == 2 block: - name: Stop and disable swift storage services diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml index e547b32371..8bc4b222e0 100644 --- a/docker/services/tacker.yaml +++ b/docker/services/tacker.yaml @@ -159,10 +159,6 @@ outputs: - name: Set fact tacker_enabled set_fact: tacker_enabled: "{{ tacker_enabled_result.rc == 0 }}" - - name: "PreUpgrade step0,validation: Check if tacker is running" - command: systemctl is-active --quiet openstack-tacker-server - when: tacker_enabled|bool - tags: validation - when: step|int == 2 block: - name: Stop and disable tacker-server service diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index ae2fab1b0a..9787ff4c6e 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -214,12 +214,6 @@ outputs: - set_fact: httpd_running: "{{ httpd_running_result.rc == 0 }}" when: httpd_running is undefined - - name: "PreUpgrade step0,validation: Check if zaqar_wsgi is running" - shell: systemctl status 'httpd' | grep -q zaqar_wsgi - tags: validation - when: - - zaqar_httpd_enabled|bool - - httpd_running|bool - name: Stop and disable zaqar service when: - step|int == 2