aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-09 18:10:34 +0000
committerGerrit Code Review <review@openstack.org>2016-11-09 18:10:35 +0000
commit1efaa8c6a2351c35fdb5e18544a5c4dd3cee8c4f (patch)
tree1b5206a1261bad6aee414058b26406043317be0f /puppet
parentf754c57ee15968b88598c1019c7ef046b5307f9c (diff)
parent17e727d716ac0346fab457886d8e2bc7355b3a3f (diff)
Merge "Reload haproxy configuration as a post-deployment step"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/post.j2.yaml21
1 files changed, 21 insertions, 0 deletions
diff --git a/puppet/post.j2.yaml b/puppet/post.j2.yaml
index 65c96ac2..8218f41a 100644
--- a/puppet/post.j2.yaml
+++ b/puppet/post.j2.yaml
@@ -47,6 +47,15 @@ resources:
properties:
StepConfig: {get_param: [role_data, {{role.name}}, step_config]}
+ {% if role.name == 'Controller' %}
+ ControllerPrePuppet:
+ type: OS::TripleO::Tasks::ControllerPrePuppet
+ properties:
+ servers: {get_param: [servers, Controller]}
+ input_values:
+ update_identifier: {get_param: DeployIdentifier}
+ {% endif %}
+
# Step through a series of configuration steps
{{role.name}}Deployment_Step1:
type: OS::Heat::StructuredDeploymentGroup
@@ -136,4 +145,16 @@ resources:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: [servers, {{role.name}}]}
+
+ {% if role.name == 'Controller' %}
+ ControllerPostPuppet:
+ depends_on:
+ - ControllerExtraConfigPost
+ type: OS::TripleO::Tasks::ControllerPostPuppet
+ properties:
+ servers: {get_param: [servers, Controller]}
+ input_values:
+ update_identifier: {get_param: DeployIdentifier}
+ {% endif %}
+
{% endfor %}