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
This commit is contained in:
parent
c9afae93f2
commit
628d7a7901
|
@ -122,28 +122,32 @@ resources:
|
|||
step: 5
|
||||
update_identifier: {get_param: DeployIdentifier}
|
||||
|
||||
# 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, {{role.name}}]}
|
||||
|
||||
# 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}}Deployment_Step5
|
||||
- {{dep.name}}ExtraConfigPost
|
||||
{% endfor %}
|
||||
properties:
|
||||
servers: {get_param: servers}
|
||||
input_values:
|
||||
update_identifier: {get_param: DeployIdentifier}
|
||||
|
||||
# Note, this should come last, so use depends_on to ensure
|
||||
# this is created after any other resources.
|
||||
{{role.name}}ExtraConfigPost:
|
||||
depends_on:
|
||||
{% for dep in roles %}
|
||||
- {{dep.name}}PostConfig
|
||||
{% endfor %}
|
||||
type: OS::TripleO::NodeExtraConfigPost
|
||||
properties:
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
|
||||
{% if role.name.lower() == 'compute' %}
|
||||
CopyEtcConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
|
|
@ -10,8 +10,8 @@ parameters:
|
|||
|
||||
resources:
|
||||
|
||||
{%- for role in roles -%}
|
||||
{% if "controller" in role.tags %}
|
||||
{%- for role in roles %}
|
||||
{%- if role.name.lower() == 'controller' %}
|
||||
{{role.name}}PostPuppetMaintenanceModeConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
|
@ -37,6 +37,6 @@ resources:
|
|||
properties:
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
input_values: {get_param: input_values}
|
||||
{%- endif -%}
|
||||
{% endfor %}
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
|
|
|
@ -44,26 +44,31 @@
|
|||
update_identifier: {get_param: DeployIdentifier}
|
||||
{% endfor %}
|
||||
|
||||
# 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, {{role.name}}]}
|
||||
|
||||
# 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}}Deployment_Step5
|
||||
- {{dep.name}}ExtraConfigPost
|
||||
{% endfor %}
|
||||
properties:
|
||||
servers: {get_param: servers}
|
||||
input_values:
|
||||
update_identifier: {get_param: DeployIdentifier}
|
||||
|
||||
# Note, this should come last, so use depends_on to ensure
|
||||
# this is created after any other resources.
|
||||
{{role.name}}ExtraConfigPost:
|
||||
depends_on:
|
||||
{% for dep in roles %}
|
||||
- {{dep.name}}PostConfig
|
||||
{% endfor %}
|
||||
type: OS::TripleO::NodeExtraConfigPost
|
||||
properties:
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
|
||||
{% endfor %}
|
||||
|
|
Loading…
Reference in New Issue