aboutsummaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks/post_puppet_pacemaker.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-12-22 12:06:55 +0100
committerJiri Stransky <jistr@redhat.com>2016-01-26 15:21:24 +0100
commit9e5bc6593898e4a400797ab5d3a74db7b4746329 (patch)
tree83097c57e0f20dda1aa1e9a6c8a15cf23140159a /extraconfig/tasks/post_puppet_pacemaker.yaml
parent2a9985459b1ef76cfc410e79417a0d6292670387 (diff)
Split pacemaker common check_service function out of _restart.sh
Also split out echo_error function to DRY the error output code and allow changing the way we report errors in a single place. Change-Id: I448bf0eb49390f03155335736bb4ab4e979db128 Co-Authored-By: Jiri Stransky <jistr@redhat.com>
Diffstat (limited to 'extraconfig/tasks/post_puppet_pacemaker.yaml')
-rw-r--r--extraconfig/tasks/post_puppet_pacemaker.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/extraconfig/tasks/post_puppet_pacemaker.yaml b/extraconfig/tasks/post_puppet_pacemaker.yaml
index 7de41d94..fbed9ce5 100644
--- a/extraconfig/tasks/post_puppet_pacemaker.yaml
+++ b/extraconfig/tasks/post_puppet_pacemaker.yaml
@@ -33,7 +33,11 @@ resources:
type: OS::Heat::SoftwareConfig
properties:
group: script
- config: {get_file: pacemaker_resource_restart.sh}
+ config:
+ list_join:
+ - ''
+ - - get_file: pacemaker_common_functions.sh
+ - get_file: pacemaker_resource_restart.sh
ControllerPostPuppetRestartDeployment:
type: OS::Heat::SoftwareDeployments