openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix for the resource ControllerPostPuppetMaintenanceModeDeployment

Browse Source 
Closes-Bug:1686619

Change-Id: I7c32ca39a456de9833d30c31d41fcb727d2b0a34
This commit is contained in:
Carlos Camacho 2017-04-27 11:00:32 +02:00
parent c9d758ce6a
commit 77b4bd53da
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extraconfig/tasks/post_puppet_pacemaker.yaml → extraconfig/tasks/post_puppet_pacemaker.j2.yaml
View File

@ -10,7 +10,9 @@ parameters:
resources:
ControllerPostPuppetMaintenanceModeConfig:
{%- for role in roles -%}
{% if "controller" in role.tags %}
{{role.name}}PostPuppetMaintenanceModeConfig:
type: OS::Heat::SoftwareConfig
properties:
group: script
@ -22,16 +24,19 @@ resources:
pcs property set maintenance-mode=false
fi
ControllerPostPuppetMaintenanceModeDeployment:
{{role.name}}PostPuppetMaintenanceModeDeployment:
type: OS::Heat::SoftwareDeployments
properties:
servers: {get_param: servers}
config: {get_resource: ControllerPostPuppetMaintenanceModeConfig}
servers: {get_param: [servers, {{role.name}}]}
config: {get_resource: {{role.name}}PostPuppetMaintenanceModeConfig}
input_values: {get_param: input_values}
ControllerPostPuppetRestart:
type: OS::TripleO::Tasks::ControllerPostPuppetRestart
depends_on: ControllerPostPuppetMaintenanceModeDeployment
{{role.name}}PostPuppetRestart:
type: OS::TripleO::Tasks::{{role.name}}PostPuppetRestart
depends_on: {{role.name}}PostPuppetMaintenanceModeDeployment
properties:
servers: {get_param: servers}
servers: {get_param: [servers, {{role.name}}]}
input_values: {get_param: input_values}
{%- endif -%}
{% endfor %}

2
extraconfig/tasks/post_puppet_pacemaker_restart.yaml
View File

@ -23,6 +23,6 @@ resources:
ControllerPostPuppetRestartDeployment:
type: OS::Heat::SoftwareDeployments
properties:
servers: {get_param: servers}
servers: {get_param: servers}
config: {get_resource: ControllerPostPuppetRestartConfig}
input_values: {get_param: input_values}

2
extraconfig/tasks/pre_puppet_pacemaker.yaml
View File

@ -20,6 +20,6 @@ resources:
ControllerPrePuppetMaintenanceModeDeployment:
type: OS::Heat::SoftwareDeployments
properties:
servers: {get_param: servers}
servers: {get_param: servers}
config: {get_resource: ControllerPrePuppetMaintenanceModeConfig}
input_values: {get_param: input_values}

2
puppet/puppet-steps.j2
View File

@ -51,7 +51,7 @@
- {{dep.name}}Deployment_Step5
{% endfor %}
properties:
servers: {get_param: [servers, {{role.name}}]}
servers: {get_param: servers}
input_values:
update_identifier: {get_param: DeployIdentifier}