X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fpost_puppet_pacemaker.yaml;h=a304e55bc7e69dcce585c8e0e53dd03a310e672b;hb=68402dc7f538418b1e0eb23bb782daf7e3bcadd4;hp=fbed9ce5ccb005b4878462aa0b9da74c128181e7;hpb=f06b99d389ff731e3098a542d6bbbce0914d1c9d;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/post_puppet_pacemaker.yaml b/extraconfig/tasks/post_puppet_pacemaker.yaml
index fbed9ce5..a304e55b 100644
--- a/extraconfig/tasks/post_puppet_pacemaker.yaml
+++ b/extraconfig/tasks/post_puppet_pacemaker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: ocata
 description: 'Post-Puppet Config for Pacemaker deployments'
 
 parameters:
@@ -25,24 +25,13 @@ resources:
   ControllerPostPuppetMaintenanceModeDeployment:
     type: OS::Heat::SoftwareDeployments
     properties:
-      servers:  {get_param: servers}
+      servers: {get_param: servers}
       config: {get_resource: ControllerPostPuppetMaintenanceModeConfig}
       input_values: {get_param: input_values}
 
-  ControllerPostPuppetRestartConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config:
-        list_join:
-        - ''
-        - - get_file: pacemaker_common_functions.sh
-          - get_file: pacemaker_resource_restart.sh
-
-  ControllerPostPuppetRestartDeployment:
-    type: OS::Heat::SoftwareDeployments
+  ControllerPostPuppetRestart:
+    type: OS::TripleO::Tasks::ControllerPostPuppetRestart
     depends_on: ControllerPostPuppetMaintenanceModeDeployment
     properties:
-      servers:  {get_param: servers}
-      config: {get_resource: ControllerPostPuppetRestartConfig}
+      servers: {get_param: servers}
       input_values: {get_param: input_values}