Merge "Split pacemaker common check_service function out of _restart.sh"

3 files changed, 44 insertions, 34 deletions

diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh
new file mode 100755
index 00000000..32d06c4a
--- /dev/null
+++ b/extraconfig/tasks/pacemaker_common_functions.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -eu
+
+function check_resource {
+
+  if [ "$#" -ne 3 ]; then
+      echo_error "ERROR: check_resource function expects 3 parameters, $# given"
+      exit 1
+  fi
+
+  service=$1
+  state=$2
+  timeout=$3
+
+  if [ "$state" = "stopped" ]; then
+      match_for_incomplete='Started'
+  else # started
+      match_for_incomplete='Stopped'
+  fi
+
+  if timeout -k 10 $timeout crm_resource --wait; then
+      node_states=$(pcs status --full | grep "$service" | grep -v Clone)
+      if echo "$node_states" | grep -q "$match_for_incomplete"; then
+          echo_error "ERROR: cluster finished transition but $service was not in $state state, exiting."
+          exit 1
+      else
+        echo "$service has $state"
+      fi
+  else
+      echo_error "ERROR: cluster remained unstable for more than $timeout seconds, exiting."
+      exit 1
+  fi
+
+}
+
+function echo_error {
+    echo "$@" | tee /dev/fd2
+}
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index dfc335bf..b2bdc55a 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -3,39 +3,6 @@
 set -eux
 
 pacemaker_status=$(systemctl is-active pacemaker)
-check_interval=3
-
-function check_resource {
-
-  if [ "$#" -ne 3 ]; then
-      echo "ERROR: check_resource function expects 3 parameters, $# given" | tee /dev/fd/2
-      exit 1
-  fi
-
-  service=$1
-  state=$2
-  timeout=$3
-
-  if [ "$state" = "stopped" ]; then
-      match_for_incomplete='Started'
-  else # started
-      match_for_incomplete='Stopped'
-  fi
-
-  if timeout -k 10 $timeout crm_resource --wait; then
-      node_states=$(pcs status --full | grep "$service" | grep -v Clone)
-      if echo "$node_states" | grep -q "$match_for_incomplete"; then
-          echo "ERROR: cluster settled but $service was not in $state state, exiting." | tee /dev/fd/2
-          exit 1
-      else
-        echo "$service has $state"
-      fi
-  else
-      echo "ERROR: cluster remained unstable for more than $timeout seconds, exiting." | tee /dev/fd/2
-      exit 1
-  fi
-
-}
 
 # Run if pacemaker is running, we're the bootstrap node,
 # and we're updating the deployment (not creating).
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