summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-06-08 23:18:44 +0200
committerCarlos Camacho <ccamacho@redhat.com>2017-06-12 19:17:21 +0200
commit834fe9cde3a2931b673529793c2571651bc84672 (patch)
treeb4aa7c39e6a3500b05a662897498c1e291bb2d3c /docker
parent52b6ed7e27966a4ef285783369f899b77c37ba77 (diff)
Moving *postconfig where it was *postpuppet
We need to ensure that the pacemaker cluster restarts in the end of the deployment. Due to the resources renaming we added the postconfig resource not in the end of the deployment as it was *postpuppet. Closes-bug: 1695904 Change-Id: Ic6978fcff591635223b354831cd6cbe0802316cf
Diffstat (limited to 'docker')
-rw-r--r--docker/docker-steps.j227
1 files changed, 16 insertions, 11 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index a56ca02b..7f70fe7e 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -220,26 +220,31 @@ resources:
{% endfor %}
# END CONFIG STEPS
- {{role.name}}PostConfig:
- type: OS::TripleO::Tasks::{{role.name}}PostConfig
+ # Note, this should be the last step to execute configuration changes.
+ # Ensure that all {{role.name}}ExtraConfigPost steps are executed
+ # after all the previous deployment steps.
+ {{role.name}}ExtraConfigPost:
depends_on:
{% for dep in roles %}
- {{dep.name}}Deployment_Step5
{% endfor %}
+ type: OS::TripleO::NodeExtraConfigPost
properties:
- servers: {get_param: servers}
- input_values:
- update_identifier: {get_param: DeployIdentifier}
+ servers: {get_param: [servers, {{role.name}}]}
- # Note, this should come last, so use depends_on to ensure
- # this is created after any other resources.
- {{role.name}}ExtraConfigPost:
+ # The {{role.name}}PostConfig steps are in charge of
+ # quiescing all services, i.e. in the Controller case,
+ # we should run a full service reload.
+ {{role.name}}PostConfig:
+ type: OS::TripleO::Tasks::{{role.name}}PostConfig
depends_on:
{% for dep in roles %}
- - {{dep.name}}PostConfig
+ - {{dep.name}}ExtraConfigPost
{% endfor %}
- type: OS::TripleO::NodeExtraConfigPost
properties:
- servers: {get_param: [servers, {{role.name}}]}
+ servers: {get_param: servers}
+ input_values:
+ update_identifier: {get_param: DeployIdentifier}
+
{% endfor %}