Merge "Add mistral service support for composable upgrades" into stable/ocata

[apex-tripleo-heat-templates.git] / puppet / services / cinder-api.yaml

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index bde3e04..52c4656 100644 (file)
--- 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