From 9e5bc6593898e4a400797ab5d3a74db7b4746329 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 22 Dec 2015 12:06:55 +0100 Subject: 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 --- extraconfig/tasks/post_puppet_pacemaker.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'extraconfig/tasks/post_puppet_pacemaker.yaml') 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 -- cgit 1.2.3-korg