diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-29 16:03:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-29 16:03:05 +0000 |
| commit | 7d704fbd074cdeb2b381aab353ee1deaeb9ae736 (patch) | |
| tree | 625a666b1b4564691ee96fd2fa9e47fce8840cbd /puppet/controller-config-pacemaker.yaml | |
| parent | 717d949ddfe128c84239418c5559464172ec236f (diff) | |
| parent | 9988bd25aa4bac1375ef4783d636c7adecedee92 (diff) | |
Merge "Increment step count to include ringbuilder"
Diffstat (limited to 'puppet/controller-config-pacemaker.yaml')
| -rw-r--r-- | puppet/controller-config-pacemaker.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml index dc81498a..21db825a 100644 --- a/puppet/controller-config-pacemaker.yaml +++ b/puppet/controller-config-pacemaker.yaml @@ -22,7 +22,10 @@ resources: outputs: - name: result config: - get_file: manifests/overcloud_controller_pacemaker.pp + list_join: + - '' + - - get_file: manifests/overcloud_controller_pacemaker.pp + - get_file: manifests/ringbuilder.pp outputs: OS::stack_id: |