diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-21 16:47:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-21 16:47:21 +0000 |
| commit | 0602e95351f3b402fa4fc17478061a000ecde5bd (patch) | |
| tree | 9ab027e9e711487c1ff83da902abf5e1d05a36f7 /puppet/services | |
| parent | 30574c7af2b64b3cd5656ae1b7864fac21180550 (diff) | |
| parent | 10eed9c1ae1bfbf86361066736e3d17634770456 (diff) | |
Merge "Adds post_upgrade_tasks for any service post-upgrade ansible tasks" into stable/pike
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/pacemaker/cinder-volume.yaml | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml index f4675875..cbbf2eaf 100644 --- a/puppet/services/pacemaker/cinder-volume.yaml +++ b/puppet/services/pacemaker/cinder-volume.yaml @@ -66,17 +66,9 @@ outputs: resource: openstack-cinder-volume state: disable wait_for_resource: true - - name: get bootstrap nodeid - tags: step5 - 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 + post_upgrade_tasks: + - name: Start cinder_volume service (pacemaker) + tags: step1 + pacemaker_resource: + resource: openstack-cinder-volume + state: enable |