Put service stop at step1 and quiesce at step2.

In the previous release[1], the services were stopped before the
pacemaker services, so that they get a chance to send last message to
the database/rabbitmq queue:

Let's do the upgrade in the same order.

[1] https://github.com/openstack/tripleo-heat-templates/blob/stable/newton/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh#L13-L71

Change-Id: I1c4045e8b9167396c9dfa4da99973102f1af1218

49 files changed, 68 insertions, 55 deletions

diff --git a/puppet/services/README.rst b/puppet/services/README.rst
index 223c3ed0..f19b6cca 100644
--- a/puppet/services/README.rst
+++ b/puppet/services/README.rst
@@ -100,9 +100,22 @@ step, "step2" for the second, etc.
 
    Steps/tages correlate to the following:
 
-   1) Quiesce the control-plane, e.g disable LoadBalancer, stop pacemaker cluster
-
-   2) Stop all control-plane services, ready for upgrade
+   1) Stop all control-plane services.
+
+   2) Quiesce the control-plane, e.g disable LoadBalancer, stop
+      pacemaker cluster: this will stop the following resource:
+      - ocata:
+        - galera
+        - rabbit
+        - redis
+        - haproxy
+        - vips
+        - cinder-volumes
+        - cinder-backup
+        - manilla-share
+        - rbd-mirror
+
+      The exact order is controlled by the cluster constraints.
 
    3) Perform a package update and install new packages: A general
       upgrade is done, and only new package should go into service
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index 4bd9fc47..d7c87b61 100644
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -87,5 +87,5 @@ outputs:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: Stop aodh_api service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
diff --git a/puppet/services/aodh-evaluator.yaml b/puppet/services/aodh-evaluator.yaml
index 56dbb558..900eb687 100644
--- a/puppet/services/aodh-evaluator.yaml
+++ b/puppet/services/aodh-evaluator.yaml
@@ -45,5 +45,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-aodh-evaluator' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop aodh_evaluator service
-          tags: step2
+          tags: step1
           service: name=openstack-aodh-evaluator state=stopped
diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml
index 76db0ca8..c5dc4731 100644
--- a/puppet/services/aodh-listener.yaml
+++ b/puppet/services/aodh-listener.yaml
@@ -45,5 +45,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop aodh_listener service
-          tags: step2
+          tags: step1
           service: name=openstack-aodh-listener state=stopped
diff --git a/puppet/services/aodh-notifier.yaml b/puppet/services/aodh-notifier.yaml
index 30c67635..3a225752 100644
--- a/puppet/services/aodh-notifier.yaml
+++ b/puppet/services/aodh-notifier.yaml
@@ -45,5 +45,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-aodh-notifier' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop aodh_notifier service
-          tags: step2
+          tags: step1
           service: name=openstack-aodh-notifier state=stopped
diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml
index 9baca145..e611e020 100644
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/puppet/services/ceilometer-agent-central.yaml
@@ -60,5 +60,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop ceilometer_agent_central service
-          tags: step2
+          tags: step1
           service: name=openstack-ceilometer-central state=stopped
diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
index 21f5ce63..75c7cb36 100644
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@@ -54,5 +54,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop ceilometer_agent_compute service
-          tags: step2
+          tags: step1
           service: name=openstack-ceilometer-compute state=stopped
diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml
index 760acd65..429fe222 100644
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/puppet/services/ceilometer-agent-notification.yaml
@@ -54,5 +54,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-ceilometer-notification' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop ceilometer_agent_notification service
-          tags: step2
+          tags: step1
           service: name=openstack-ceilometer-notification state=stopped
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 741f8da1..f5ee9d40 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -94,5 +94,5 @@ outputs:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: Stop ceilometer_api service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml
index a219f9eb..3dc3340e 100644
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@@ -64,5 +64,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-ceilometer-collector' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop ceilometer_collector service
-          tags: step2
+          tags: step1
           service: name=openstack-ceilometer-collector state=stopped
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index bde3e044..52c46568 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -154,14 +154,14 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-cinder-api' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: check for cinder running under apache (post upgrade)
-          tags: step2
+          tags: step1
           shell: "apachectl -t -D DUMP_VHOSTS | grep -q cinder"
           register: cinder_apache
           ignore_errors: true
         - name: Stop cinder_api service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
           when: "cinder_apache.rc == 0"
         - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
-          tags: step2
+          tags: step1
           service: name=openstack-cinder-api state=stopped enabled=no
diff --git a/puppet/services/cinder-scheduler.yaml b/puppet/services/cinder-scheduler.yaml
index f102810e..63a4f169 100644
--- a/puppet/services/cinder-scheduler.yaml
+++ b/puppet/services/cinder-scheduler.yaml
@@ -56,5 +56,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-cinder-scheduler' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop cinder_scheduler service
-          tags: step2
+          tags: step1
           service: name=openstack-cinder-scheduler state=stopped
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 3a06afb8..74efaade 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -120,5 +120,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-cinder-volume' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop cinder_volume service
-          tags: step2
+          tags: step1
           service: name=openstack-cinder-volume state=stopped
diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml
index 6855a838..c8189802 100644
--- a/puppet/services/congress.yaml
+++ b/puppet/services/congress.yaml
@@ -93,5 +93,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-congress-server' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop congress service
-          tags: step2
+          tags: step1
           service: name=openstack-congress-server state=stopped
diff --git a/puppet/services/disabled/glance-registry.yaml b/puppet/services/disabled/glance-registry.yaml
index 4d22bddc..7bf4a1fd 100644
--- a/puppet/services/disabled/glance-registry.yaml
+++ b/puppet/services/disabled/glance-registry.yaml
@@ -26,5 +26,5 @@ outputs:
       service_name: glance_registry
       upgrade_tasks:
         - name: Stop and disable glance_registry service on upgrade
-          tags: step2
+          tags: step1
           service: name=openstack-glance-registry state=stopped enabled=no
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index d26d96aa..89f2ee84 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -141,8 +141,8 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-glance-api' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop glance_api service
-          tags: step2
+          tags: step1
           service: name=openstack-glance-api state=stopped
         - name: Stop and disable glance registry (removed for Ocata)
-          tags: step2
+          tags: step1
           service: name=openstack-glance-registry state=stopped enabled=no
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index 22c0967e..08a939a6 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -129,5 +129,5 @@ outputs:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
       upgrade_tasks:
         - name: Stop gnocchi_api service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml
index 1337b0cb..14fca137 100644
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/puppet/services/gnocchi-metricd.yaml
@@ -51,5 +51,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-gnocchi-metricd' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop gnocchi_metricd service
-          tags: step2
+          tags: step1
           service: name=openstack-gnocchi-metricd state=stopped
diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml
index 41222a79..5f24bc5d 100644
--- a/puppet/services/gnocchi-statsd.yaml
+++ b/puppet/services/gnocchi-statsd.yaml
@@ -50,5 +50,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-gnocchi-statsd' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop gnocchi_statsd service
-          tags: step2
+          tags: step1
           service: name=openstack-gnocchi-statsd state=stopped
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 358698dd..7c7df34f 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -82,7 +82,7 @@ outputs:
           shell: /usr/bin/systemctl show 'haproxy' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop haproxy service
-          tags: step1
+          tags: step2
           service: name=haproxy state=stopped
         - name: Start haproxy service
           tags: step4 # Needed at step 4 for mysql
diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index 3ae4cc70..7908baae 100644
--- a/puppet/services/heat-api-cfn.yaml
+++ b/puppet/services/heat-api-cfn.yaml
@@ -89,5 +89,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-heat-api-cfn' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api_cfn service
-          tags: step2
+          tags: step1
           service: name=openstack-heat-api-cfn state=stopped
diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml
index 56183535..bc21fd3b 100644
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/puppet/services/heat-api-cloudwatch.yaml
@@ -71,5 +71,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-heat-api-cloudwatch' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api_cloudwatch service
-          tags: step2
+          tags: step1
           service: name=openstack-heat-api-cloudwatch state=stopped
diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index 38c5b479..7eb4739c 100644
--- a/puppet/services/heat-api.yaml
+++ b/puppet/services/heat-api.yaml
@@ -89,5 +89,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-heat-api' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_api service
-          tags: step2
+          tags: step1
           service: name=openstack-heat-api state=stopped
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 7787d0a7..41974323 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -141,5 +141,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-heat-engine' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop heat_engine service
-          tags: step2
+          tags: step1
           service: name=openstack-heat-engine state=stopped
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 77983854..9fa72a3b 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -110,5 +110,5 @@ outputs:
           when: httpd_enabled.rc == 0
           tags: step0,validation
         - name: Stop Horizon (under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index a84df538..7aab6f8d 100644
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -88,5 +88,5 @@ outputs:
             - "%{hiera('mysql_bind_host')}"
       upgrade_tasks:
         - name: Stop ironic_api service
-          tags: step2
+          tags: step1
           service: name=openstack-ironic-api state=stopped
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 739db13c..f9547bef 100644
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -109,5 +109,5 @@ outputs:
         include ::tripleo::profile::base::ironic::conductor
       upgrade_tasks:
         - name: Stop ironic_conductor service
-          tags: step2
+          tags: step1
           service: name=openstack-ironic-conductor state=stopped
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 5ac8436a..f40c8d99 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -308,7 +308,7 @@ outputs:
       # Ansible tasks to handle upgrade
       upgrade_tasks:
         - name: Stop keystone service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
diff --git a/puppet/services/logging/fluentd-client.yaml b/puppet/services/logging/fluentd-client.yaml
index 94c63d33..490ccbee 100644
--- a/puppet/services/logging/fluentd-client.yaml
+++ b/puppet/services/logging/fluentd-client.yaml
@@ -69,5 +69,5 @@ outputs:
             grep '\bactive\b'
           tags: step0,validation
         - name: Stop fluentd service
-          tags: step2
+          tags: step1
           service: name=fluentd state=stopped
diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml
index a3e3b842..da596656 100644
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@@ -116,5 +116,5 @@ outputs:
             grep '\bactive\b'
           tags: step0,validation
         - name: Stop collectd service
-          tags: step2
+          tags: step1
           service: name=collectd state=stopped
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index d74a68a2..c0826549 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -69,5 +69,5 @@ outputs:
             grep '\bactive\b'
           tags: step0,validation
         - name: Stop sensu-client service
-          tags: step2
+          tags: step1
           service: name=sensu-client state=stopped
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index 4d671e15..cb6317d2 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -193,5 +193,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-server' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_api service
-          tags: step2
+          tags: step1
           service: name=neutron-server state=stopped
diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml
index 062edaa4..b31933f6 100644
--- a/puppet/services/neutron-dhcp.yaml
+++ b/puppet/services/neutron-dhcp.yaml
@@ -84,5 +84,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-dhcp-agent' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_dhcp service
-          tags: step2
+          tags: step1
           service: name=neutron-dhcp-agent state=stopped
diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index 4fa49275..572c89a5 100644
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@@ -89,5 +89,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-l3-agent' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_l3 service
-          tags: step2
+          tags: step1
           service: name=neutron-l3-agent state=stopped
diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml
index 6f5debdd..f936ecdb 100644
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@@ -80,5 +80,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-metadata-agent' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_metadata service
-          tags: step2
+          tags: step1
           service: name=neutron-metadata-agent state=stopped
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index c27bb909..25bd5b53 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -125,5 +125,5 @@ outputs:
           shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop neutron_ovs_agent service
-          tags: step2
+          tags: step1
           service: name=neutron-openvswitch-agent state=stopped
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index 9923e833..d208bede 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -152,7 +152,7 @@ outputs:
           collectd::plugins::virt::connection: "qemu:///system"
       upgrade_tasks:
         - name: Stop nova-compute service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-compute state=stopped
         # If not already set by puppet (e.g a pre-ocata version), set the
         # upgrade_level for compute to "auto"
diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index a19d0f8d..4574cae8 100644
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@@ -67,12 +67,12 @@ outputs:
         include tripleo::profile::base::nova::conductor
       upgrade_tasks:
         - name: Stop nova_conductor service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-conductor state=stopped
         # If not already set by puppet (e.g a pre-ocata version), set the
         # upgrade_level for compute to "auto"
         - name: Set compute upgrade level to auto
-          tags: step2
+          tags: step1
           ini_file:
             str_replace:
               template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml
index b5a1312a..82f329bc 100644
--- a/puppet/services/nova-consoleauth.yaml
+++ b/puppet/services/nova-consoleauth.yaml
@@ -50,5 +50,5 @@ outputs:
         include tripleo::profile::base::nova::consoleauth
       upgrade_tasks:
         - name: Stop nova_consoleauth service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-consoleauth state=stopped
diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 3ae19a67..b59e2fc6 100644
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -124,7 +124,7 @@ outputs:
               - "%{hiera('mysql_bind_host')}"
       upgrade_tasks:
         - name: Stop nova_placement service (running under httpd)
-          tags: step2
+          tags: step1
           service: name=httpd state=stopped
         # The nova placement API isn't installed in newton images, so install
         # it on upgrade
diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index e08bf182..e4b6bb43 100644
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@@ -65,5 +65,5 @@ outputs:
         include tripleo::profile::base::nova::scheduler
       upgrade_tasks:
         - name: Stop nova_scheduler service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-scheduler state=stopped
diff --git a/puppet/services/nova-vnc-proxy.yaml b/puppet/services/nova-vnc-proxy.yaml
index f6cf9649..42335ade 100644
--- a/puppet/services/nova-vnc-proxy.yaml
+++ b/puppet/services/nova-vnc-proxy.yaml
@@ -66,5 +66,5 @@ outputs:
         include tripleo::profile::base::nova::vncproxy
       upgrade_tasks:
         - name: Stop nova_vnc_proxy service
-          tags: step2
+          tags: step1
           service: name=openstack-nova-consoleauth state=stopped
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 9398d6b5..5be58c18 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -136,7 +136,7 @@ outputs:
           tags: step0,validation
           pacemaker_cluster: state=online check_and_fail=true
         - name: Stop pacemaker cluster
-          tags: step1
+          tags: step2
           pacemaker_cluster: state=offline
         - name: Start pacemaker cluster
           tags: step4
diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml
index 8573ea81..96b3d6e3 100644
--- a/puppet/services/sahara-api.yaml
+++ b/puppet/services/sahara-api.yaml
@@ -92,5 +92,5 @@ outputs:
             - "%{hiera('mysql_bind_host')}"
       upgrade_tasks:
         - name: Stop sahara_api service
-          tags: step2
+          tags: step1
           service: name=openstack-sahara-api state=stopped
diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index 176514ec..c0b6b3e6 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -51,5 +51,5 @@ outputs:
         include ::tripleo::profile::base::sahara::engine
       upgrade_tasks:
         - name: Stop sahara_engine service
-          tags: step2
+          tags: step1
           service: name=openstack-sahara-engine state=stopped
diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml
index fd6ed818..80c29f95 100644
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@@ -45,5 +45,5 @@ outputs:
         include ::tripleo::profile::base::snmp
       upgrade_tasks:
         - name: Stop snmp service
-          tags: step2
+          tags: step1
           service: name=snmpd state=stopped
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index c941b598..9b0d2de1 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -167,5 +167,5 @@ outputs:
             - ResellerAdmin
       upgrade_tasks:
         - name: Stop swift_proxy service
-          tags: step2
+          tags: step1
           service: name=openstack-swift-proxy state=stopped
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 247b23ff..261aadeb 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -103,7 +103,7 @@ outputs:
         include ::tripleo::profile::base::swift::storage
       upgrade_tasks:
         - name: Stop swift storage services
-          tags: step2
+          tags: step1
           service: name={{ item }} state=stopped
           with_items:
             - openstack-swift-account-auditor
diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml
index 6ceb9f19..a690a317 100644
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@@ -93,5 +93,5 @@ outputs:
           shell: /usr/bin/systemctl show 'openstack-tacker-server' --property ActiveState | grep '\bactive\b'
           tags: step0,validation
         - name: Stop tacker service
-          tags: step2
+          tags: step1
           service: name=openstack-tacker-server state=stopped