Fix for the resource ControllerPostPuppetMaintenanceModeDeployment

Closes-Bug:1686619

Change-Id: I7c32ca39a456de9833d30c31d41fcb727d2b0a34

extraconfig/tasks/post_puppet_pacemaker.j2.yaml

@@ -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 %}
+

extraconfig/tasks/post_puppet_pacemaker_restart.yaml

@@ -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}

extraconfig/tasks/pre_puppet_pacemaker.yaml

@@ -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}

puppet/puppet-steps.j2

@@ -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}