summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-06-08 23:18:44 +0200
committerCarlos Camacho <ccamacho@redhat.com>2017-06-13 11:09:19 +0200
commit628d7a7901bae6e1549d16e9203392da4fb117b2 (patch)
treed3b74c9ae2b304d4a651ffcb50da308f7843c764
parentc9afae93f2abc1a8622737c5a4c878b0ca3faad4 (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
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Code-Review+2: Emilien Macchi <emilien@redhat.com> Workflow+1: Emilien Macchi <emilien@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 18:07:54 +0000 Reviewed-on: https://review.openstack.org/472972 Project: openstack/tripleo-heat-templates Branch: refs/heads/stable/ocata
-rw-r--r--docker/post.j2.yaml26
-rw-r--r--extraconfig/tasks/post_puppet_pacemaker.j2.yaml8
-rw-r--r--puppet/puppet-steps.j227
3 files changed, 35 insertions, 26 deletions
diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml
index dfa8ac2..1aa9e18 100644
--- a/docker/post.j2.yaml
+++ b/docker/post.j2.yaml
@@ -122,27 +122,31 @@ resources:
122 step: 5 122 step: 5
123 update_identifier: {get_param: DeployIdentifier} 123 update_identifier: {get_param: DeployIdentifier}
124 124
125 {{role.name}}PostConfig: 125 # Note, this should be the last step to execute configuration changes.
126 type: OS::TripleO::Tasks::{{role.name}}PostConfig 126 # Ensure that all {{role.name}}ExtraConfigPost steps are executed
127 # after all the previous deployment steps.
128 {{role.name}}ExtraConfigPost:
127 depends_on: 129 depends_on:
128 {% for dep in roles %} 130 {% for dep in roles %}
129 - {{dep.name}}Deployment_Step5 131 - {{dep.name}}Deployment_Step5
130 {% endfor %} 132 {% endfor %}
133 type: OS::TripleO::NodeExtraConfigPost
131 properties: 134 properties:
132 servers: {get_param: servers} 135 servers: {get_param: [servers, {{role.name}}]}
133 input_values:
134 update_identifier: {get_param: DeployIdentifier}
135 136
136 # Note, this should come last, so use depends_on to ensure 137 # The {{role.name}}PostConfig steps are in charge of
137 # this is created after any other resources. 138 # quiescing all services, i.e. in the Controller case,
138 {{role.name}}ExtraConfigPost: 139 # we should run a full service reload.
140 {{role.name}}PostConfig:
141 type: OS::TripleO::Tasks::{{role.name}}PostConfig
139 depends_on: 142 depends_on:
140 {% for dep in roles %} 143 {% for dep in roles %}
141 - {{dep.name}}PostConfig 144 - {{dep.name}}ExtraConfigPost
142 {% endfor %} 145 {% endfor %}
143 type: OS::TripleO::NodeExtraConfigPost
144 properties: 146 properties:
145 servers: {get_param: [servers, {{role.name}}]} 147 servers: {get_param: servers}
148 input_values:
149 update_identifier: {get_param: DeployIdentifier}
146 150
147 {% if role.name.lower() == 'compute' %} 151 {% if role.name.lower() == 'compute' %}
148 CopyEtcConfig: 152 CopyEtcConfig:
diff --git a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
index 0db0bc1..6704b35 100644
--- a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
+++ b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
@@ -10,8 +10,8 @@ parameters:
10 10
11resources: 11resources:
12 12
13{%- for role in roles -%} 13{%- for role in roles %}
14{% if "controller" in role.tags %} 14 {%- if role.name.lower() == 'controller' %}
15 {{role.name}}PostPuppetMaintenanceModeConfig: 15 {{role.name}}PostPuppetMaintenanceModeConfig:
16 type: OS::Heat::SoftwareConfig 16 type: OS::Heat::SoftwareConfig
17 properties: 17 properties:
@@ -37,6 +37,6 @@ resources:
37 properties: 37 properties:
38 servers: {get_param: [servers, {{role.name}}]} 38 servers: {get_param: [servers, {{role.name}}]}
39 input_values: {get_param: input_values} 39 input_values: {get_param: input_values}
40{%- endif -%} 40 {%- endif %}
41{% endfor %} 41{%- endfor %}
42 42
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 53ffe7a..92685d7 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -44,26 +44,31 @@
44 update_identifier: {get_param: DeployIdentifier} 44 update_identifier: {get_param: DeployIdentifier}
45{% endfor %} 45{% endfor %}
46 46
47 {{role.name}}PostConfig: 47 # Note, this should be the last step to execute configuration changes.
48 type: OS::TripleO::Tasks::{{role.name}}PostConfig 48 # Ensure that all {{role.name}}ExtraConfigPost steps are executed
49 # after all the previous deployment steps.
50 {{role.name}}ExtraConfigPost:
49 depends_on: 51 depends_on:
50 {% for dep in roles %} 52 {% for dep in roles %}
51 - {{dep.name}}Deployment_Step5 53 - {{dep.name}}Deployment_Step5
52 {% endfor %} 54 {% endfor %}
55 type: OS::TripleO::NodeExtraConfigPost
53 properties: 56 properties:
54 servers: {get_param: servers} 57 servers: {get_param: [servers, {{role.name}}]}
55 input_values:
56 update_identifier: {get_param: DeployIdentifier}
57 58
58 # Note, this should come last, so use depends_on to ensure 59 # The {{role.name}}PostConfig steps are in charge of
59 # this is created after any other resources. 60 # quiescing all services, i.e. in the Controller case,
60 {{role.name}}ExtraConfigPost: 61 # we should run a full service reload.
62 {{role.name}}PostConfig:
63 type: OS::TripleO::Tasks::{{role.name}}PostConfig
61 depends_on: 64 depends_on:
62 {% for dep in roles %} 65 {% for dep in roles %}
63 - {{dep.name}}PostConfig 66 - {{dep.name}}ExtraConfigPost
64 {% endfor %} 67 {% endfor %}
65 type: OS::TripleO::NodeExtraConfigPost
66 properties: 68 properties:
67 servers: {get_param: [servers, {{role.name}}]} 69 servers: {get_param: servers}
70 input_values:
71 update_identifier: {get_param: DeployIdentifier}
72
68 73
69{% endfor %} 74{% endfor %}