From 687b0dadca3e94ed9cfcbc2651522ceccc188e1d Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Thu, 27 Apr 2017 11:00:32 +0200
Subject: Fix for the resource ControllerPostPuppetMaintenanceModeDeployment

Depends-On: If88f403c85b79bd896a24c7816486709bd67706f
Closes-Bug:1686619
Change-Id: I7c32ca39a456de9833d30c31d41fcb727d2b0a34
(cherry picked from commit 77b4bd53dae1882ae3094597e674218b7773eda9)
---
 extraconfig/tasks/post_puppet_pacemaker.j2.yaml    | 42 ++++++++++++++++++++++
 extraconfig/tasks/post_puppet_pacemaker.yaml       | 37 -------------------
 .../tasks/post_puppet_pacemaker_restart.yaml       |  2 +-
 extraconfig/tasks/pre_puppet_pacemaker.yaml        |  2 +-
 4 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 extraconfig/tasks/post_puppet_pacemaker.j2.yaml
 delete mode 100644 extraconfig/tasks/post_puppet_pacemaker.yaml

(limited to 'extraconfig')

diff --git a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
new file mode 100644
index 00000000..0db0bc12
--- /dev/null
+++ b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml
@@ -0,0 +1,42 @@
+heat_template_version: ocata
+description: 'Post-Puppet Config for Pacemaker deployments'
+
+parameters:
+  servers:
+    type: json
+  input_values:
+     type: json
+     description: input values for the software deployments
+
+resources:
+
+{%- for role in roles -%}
+{% if "controller" in role.tags %}
+  {{role.name}}PostPuppetMaintenanceModeConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: script
+      config: |
+        #!/bin/bash
+        pacemaker_status=$(systemctl is-active pacemaker)
+
+        if [ "$pacemaker_status" = "active" ]; then
+            pcs property set maintenance-mode=false
+        fi
+
+  {{role.name}}PostPuppetMaintenanceModeDeployment:
+    type: OS::Heat::SoftwareDeployments
+    properties:
+      servers: {get_param: [servers, {{role.name}}]}
+      config: {get_resource: {{role.name}}PostPuppetMaintenanceModeConfig}
+      input_values: {get_param: input_values}
+
+  {{role.name}}PostPuppetRestart:
+    type: OS::TripleO::Tasks::{{role.name}}PostPuppetRestart
+    depends_on: {{role.name}}PostPuppetMaintenanceModeDeployment
+    properties:
+      servers: {get_param: [servers, {{role.name}}]}
+      input_values: {get_param: input_values}
+{%- endif -%}
+{% endfor %}
+
diff --git a/extraconfig/tasks/post_puppet_pacemaker.yaml b/extraconfig/tasks/post_puppet_pacemaker.yaml
deleted file mode 100644
index a304e55b..00000000
--- a/extraconfig/tasks/post_puppet_pacemaker.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: ocata
-description: 'Post-Puppet Config for Pacemaker deployments'
-
-parameters:
-  servers:
-    type: json
-  input_values:
-     type: json
-     description: input values for the software deployments
-
-resources:
-
-  ControllerPostPuppetMaintenanceModeConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config: |
-        #!/bin/bash
-        pacemaker_status=$(systemctl is-active pacemaker)
-
-        if [ "$pacemaker_status" = "active" ]; then
-            pcs property set maintenance-mode=false
-        fi
-
-  ControllerPostPuppetMaintenanceModeDeployment:
-    type: OS::Heat::SoftwareDeployments
-    properties:
-      servers: {get_param: servers}
-      config: {get_resource: ControllerPostPuppetMaintenanceModeConfig}
-      input_values: {get_param: input_values}
-
-  ControllerPostPuppetRestart:
-    type: OS::TripleO::Tasks::ControllerPostPuppetRestart
-    depends_on: ControllerPostPuppetMaintenanceModeDeployment
-    properties:
-      servers: {get_param: servers}
-      input_values: {get_param: input_values}
diff --git a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml
index 475a6688..07f3d00d 100644
--- a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml
+++ b/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}
diff --git a/extraconfig/tasks/pre_puppet_pacemaker.yaml b/extraconfig/tasks/pre_puppet_pacemaker.yaml
index aa7514f9..a4244633 100644
--- a/extraconfig/tasks/pre_puppet_pacemaker.yaml
+++ b/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}
-- 
cgit 1.2.3-korg