summaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-24 18:42:00 +0000
committerGerrit Code Review <review@openstack.org>2017-04-24 18:42:00 +0000
commitb364c5eb9dab93e3fb5f3bb329ee27bca32e985c (patch)
treed2bdc7701bfa0b97496f35f290dbdc476d48fe4e /extraconfig
parent3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff)
parent258c6ce52d0c8467f34693722a883d96345802b2 (diff)
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'extraconfig')
-rw-r--r--extraconfig/tasks/post_puppet_pacemaker.yaml4
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}