Merge "Unset default value for the DockerCephDaemonImage" into stable/pike

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

diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml
index a1134f3..f467587 100644 (file)
--- a/puppet/services/pacemaker/cinder-volume.yaml
+++ b/puppet/services/pacemaker/cinder-volume.yaml
@@ -66,11 +66,17 @@ outputs:
             resource: openstack-cinder-volume
             state: disable
             wait_for_resource: true
-        - name: Sync cinder DB
+        - name: get bootstrap nodeid
           tags: step5
-          command: cinder-manage db sync
-        - name: Start cinder_volume service (pacemaker)
-          tags: step5
-          pacemaker_resource:
-            resource: openstack-cinder-volume
-            state: enable
+          command: hiera bootstrap_nodeid
+          register: bootstrap_node
+        - block:
+          - name: Sync cinder DB
+            tags: step5
+            command: cinder-manage db sync
+          - name: Start cinder_volume service (pacemaker)
+            tags: step5
+            pacemaker_resource:
+              resource: openstack-cinder-volume
+              state: enable
+          when: bootstrap_node.stdout == ansible_hostname