Merge "[Rocky/Queens Only] Remove pre-upgrade validation tasks in cont services." into stable/rocky

2019-05-30 16:12:46 +00:00 · 2019-05-30 16:12:46 +00:00 · 5c910e4ddc
parent 2a0c1fadd0 7e0a4d0e52
commit 5c910e4ddc
80 changed files with 0 additions and 396 deletions
--- 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)
--- 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
--- 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
--- 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
--- 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
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@ -165,10 +165,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
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@ -140,14 +140,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
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@ -144,10 +144,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
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@ -171,10 +171,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
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@ -259,10 +259,6 @@ outputs:
            - name: Set fact cinder_api_apache (upgrade)
              set_fact:
                cinder_api_apache: "{{ cinder_api_apache.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
            - name: Ensure all online data migrations for Cinder have been applied
              shell: |
                if docker ps | grep cinder_api; then
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@ -195,10 +195,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
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@ -162,10 +162,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
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@ -182,10 +182,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
--- 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
--- 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
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@ -268,10 +268,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:
            # https://bugs.launchpad.net/tripleo/+bug/1753247
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@ -204,10 +204,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
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@ -237,14 +237,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
--- 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
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@ -242,10 +242,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
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@ -259,11 +259,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
@ -280,12 +275,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
--- 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
--- 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
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@ -279,10 +279,6 @@ outputs:
            - name: Set fact haproxy_enabled
              set_fact:
                haproxy_enabled: "{{ haproxy_enabled_result.rc == 0 }}"
-            - name: "PreUpgrade step0,validation: Check service HAproxy is running"
-              command: systemctl is-active --quiet haproxy
-              tags: validation
-              when: haproxy_enabled|bool
        - when: step|int == 2
          block:
            - name: Stop and disable haproxy service
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@ -157,11 +157,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
@ -170,12 +165,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
-              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)
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@ -195,11 +195,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
@ -208,12 +203,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)
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@ -176,10 +176,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
--- 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
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@ -197,11 +197,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
@ -211,12 +206,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
            - name: Ensure all online data migrations for Ironic have been applied
              shell: |
                if docker ps | grep ironic_api; then
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@ -251,10 +251,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
--- a/docker/services/ironic-inspector.yaml
+++ b/docker/services/ironic-inspector.yaml
@ -250,10 +250,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
--- a/docker/services/ironic-neutron-agent.yaml
+++ b/docker/services/ironic-neutron-agent.yaml
@ -114,10 +114,6 @@ outputs:
            - name: Set fact ironic_neutron_agent_enabled
              set_fact:
                ironic_neutron_agent_enabled: "{{ ironic_neutron_agent_enabled_result.rc == 0 }}"
-            - name: "PreUpgrade step0,validation: Check service ironic-neutron-agent is running"
-              command: systemctl is-active --quiet ironic-neutron-agent
-              when: ironic_neutron_agent_enabled|bool
-              tags: validation
        - when: step|int == 2
          block:
            - name: Stop and disable ironic-neutron-agent service
--- 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
--- a/docker/services/keepalived.yaml
+++ b/docker/services/keepalived.yaml
@ -132,10 +132,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
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@ -246,12 +246,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)
--- 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
--- 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
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@ -153,10 +153,6 @@ outputs:
            - name: Set fact manila_share_enabled
              set_fact:
                manila_share_enabled: "{{ manila_share_enabled_result.rc == 0 }}"
-            - name: "PreUpgrade step0,validation: Check service openstack-manila-share is running"
-              command: systemctl is-active --quiet openstack-manila-share
-              when: manila_share_enabled|bool
-              tags: validation
        - when: step|int == 2
          block:
            - name: Stop and disable manila_share service
--- 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
--- a/docker/services/messaging/notify-rabbitmq.yaml
+++ b/docker/services/messaging/notify-rabbitmq.yaml
@ -238,10 +238,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
--- a/docker/services/messaging/rpc-rabbitmq.yaml
+++ b/docker/services/messaging/rpc-rabbitmq.yaml
@ -238,10 +238,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
--- a/docker/services/metrics/collectd.yaml
+++ b/docker/services/metrics/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
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@ -193,17 +193,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)
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@ -149,10 +149,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
--- a/docker/services/mistral-event-engine.yaml
+++ b/docker/services/mistral-event-engine.yaml
@ -149,10 +149,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
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@ -197,10 +197,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
--- 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
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@ -211,10 +211,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
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@ -249,10 +249,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
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@ -247,10 +247,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
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@ -155,10 +155,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
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@ -219,10 +219,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
--- a/docker/services/neutron-sriov-agent.yaml
+++ b/docker/services/neutron-sriov-agent.yaml
@ -137,10 +137,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
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@ -271,11 +271,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
@ -284,12 +279,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
            - name: Ensure all online data migrations for Nova have been applied
              shell: |
                if docker ps | grep nova_api; then
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@ -346,10 +346,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
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@ -175,10 +175,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
--- a/docker/services/nova-consoleauth.yaml
+++ b/docker/services/nova-consoleauth.yaml
@ -152,10 +152,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
--- 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
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@ -453,10 +453,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
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@ -169,12 +169,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)
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@ -153,10 +153,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
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/docker/services/nova-vnc-proxy.yaml
@ -211,10 +211,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
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@ -236,10 +236,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
@ -249,12 +245,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
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@ -161,10 +161,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
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@ -157,10 +157,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
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@ -176,10 +176,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
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@ -177,10 +177,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
--- a/docker/services/ovn-controller.yaml
+++ b/docker/services/ovn-controller.yaml
@ -154,10 +154,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
--- a/docker/services/ovn-dbs.yaml
+++ b/docker/services/ovn-dbs.yaml
@ -219,10 +219,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
--- a/docker/services/ovn-metadata.yaml
+++ b/docker/services/ovn-metadata.yaml
@ -201,10 +201,6 @@ outputs:
            - name: Set fact networking_ovn_metadata_agent_enabled
              set_fact:
                networking_ovn_metadata_agent_enabled: "{{ networking_ovn_metadata_agent_enabled_result.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
--- 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
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@ -170,10 +170,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
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@ -160,10 +160,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
--- 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
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@ -288,11 +288,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
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@ -548,11 +548,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
--- 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
--- a/docker/services/tripleo-ui.yaml
+++ b/docker/services/tripleo-ui.yaml
@ -143,12 +143,6 @@ outputs:
            - set_fact:
                httpd_running: "{{ httpd_running_result.rc == 0 }}"
              when: httpd_running is undefined
-            - name: "PreUpgrade step0,validation: Check if tripleo-ui is running"
-              shell: systemctl status 'httpd' | grep -q tripleo-ui
-              tags: validation
-              when:
-                - tripleo_ui_httpd_enabled|bool
-                - httpd_running|bool
        - when: step|int == 2
          block:
            - name: Stop and disable tripleo-ui service (running under httpd)
--- a/docker/services/xinetd.yaml
+++ b/docker/services/xinetd.yaml
@ -57,10 +57,6 @@ outputs:
            - name: Set fact xinetd_enabled
              set_fact:
                xinetd_enabled: "{{ xinetd_enabled_result.rc == 0 }}"
-            - name: "PreUpgrade step0,validation: Check if xinetd is running"
-              command: systemctl is-active --quiet xinetd
-              when: xinetd_enabled|bool
-              tags: validation
        - when: step|int == 2
          block:
            - name: stop and deactivate xinetd service
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@ -218,12 +218,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: Check if zaqar websocket is deployed
              command: systemctl is-enabled --quiet openstack-zaqar@1
              ignore_errors: True
@ -231,10 +225,6 @@ outputs:
            - name: Set fact zaqar_ws_enabled
              set_fact:
                zaqar_ws_enabled: "{{ zaqar_ws_enabled_result.rc == 0 }}"
-            - name: "PreUpgrade step0,validation: Check service openstack-zaqar@1 is running"
-              command: systemctl is-active --quiet openstack-zaqar@1
-              when: zaqar_ws_enabled|bool
-              tags: validation
        - when: step|int == 2
          block:
            - name: Stop and disable zaqar service