Merge "Add Ceilometer API and Collector service to roles_data"

[apex-tripleo-heat-templates.git] / extraconfig / tasks / pre_puppet_pacemaker.yaml

diff --git a/extraconfig/tasks/pre_puppet_pacemaker.yaml b/extraconfig/tasks/pre_puppet_pacemaker.yaml
index 2cfe92a..98b37be 100644 (file)
--- a/extraconfig/tasks/pre_puppet_pacemaker.yaml
+++ b/extraconfig/tasks/pre_puppet_pacemaker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: pike
 description: 'Pre-Puppet Config for Pacemaker deployments'
 
 parameters:
@@ -14,17 +14,12 @@ resources:
     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=true
-        fi
+      config:
+        get_file: pacemaker_maintenance_mode.sh
 
   ControllerPrePuppetMaintenanceModeDeployment:
     type: OS::Heat::SoftwareDeployments
     properties:
-      servers:  {get_param: servers}
+      servers: {get_param: servers}
       config: {get_resource: ControllerPrePuppetMaintenanceModeConfig}
       input_values: {get_param: input_values}