aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-18 02:23:17 +0000
committerGerrit Code Review <review@openstack.org>2017-08-18 02:23:17 +0000
commitf5bd6f997b728ee51e5cceee635757f692756bc7 (patch)
treeefff7e30529d0d23289d3f8797463869cbeb6540
parent4207a03b4c9866b7d1fb23eca33172592009269b (diff)
parent42d8a1c9440d4f37830bdcbda9c88a6bf39265f5 (diff)
Merge "Make cinder-manage db sync run on only one controller during upgrade"
-rw-r--r--puppet/services/pacemaker/cinder-volume.yaml20
1 files changed, 13 insertions, 7 deletions
diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml
index a1134f3..f467587 100644
--- 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