diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-12 03:06:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-12 03:06:32 +0000 |
| commit | bdc175be26655580004af41b1fd2cfe612ebf953 (patch) | |
| tree | 6eeef0ef558f7a4888480082518e049d34a832b5 /extraconfig | |
| parent | 43b33c7ed8ae2b02dc552767eaa7eb1dec4fb2e1 (diff) | |
| parent | ffb7ba51e19caba276ee256f7083833e9bcf3b76 (diff) | |
Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
Diffstat (limited to 'extraconfig')
| -rw-r--r-- | extraconfig/tasks/post_puppet_pacemaker.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/tasks/post_puppet_pacemaker.yaml b/extraconfig/tasks/post_puppet_pacemaker.yaml index a63868c9..a304e55b 100644 --- a/extraconfig/tasks/post_puppet_pacemaker.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker.yaml @@ -25,7 +25,7 @@ resources: ControllerPostPuppetMaintenanceModeDeployment: type: OS::Heat::SoftwareDeployments properties: - servers: {get_param: servers} + servers: {get_param: servers} config: {get_resource: ControllerPostPuppetMaintenanceModeConfig} input_values: {get_param: input_values} @@ -33,5 +33,5 @@ resources: type: OS::TripleO::Tasks::ControllerPostPuppetRestart depends_on: ControllerPostPuppetMaintenanceModeDeployment properties: - servers: {get_param: servers} + servers: {get_param: servers} input_values: {get_param: input_values} |