aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2017-02-28 13:25:59 +0100
committerMichele Baldessari <michele@acksyn.org>2017-03-13 08:28:48 +0100
commit841d30549bd27a8b5669955196e14085025dafad (patch)
treed9abc030dde43064eb675dc32a9fb8bb5d62f77f /puppet/services
parentd6adc5a5f2cf6e438b19dd32bd13d6d3c9701614 (diff)
Upgrades: wait for galera to be settled
We also need to wait for the galera resource to settle down before we proceed starting up with the other services. Note that before merging this, we need to land the following change in ansible-pacemaker: https://review.gerrithub.io/#/c/351387/ Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd Closes-Bug: #1668372
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/pacemaker.yaml6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 5be58c18..762d0092 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -90,7 +90,7 @@ parameters:
PacemakerResources:
type: comma_delimited_list
description: List of resources managed by pacemaker
- default: ['rabbitmq','haproxy']
+ default: ['rabbitmq','haproxy','galera']
outputs:
role_data:
@@ -143,5 +143,7 @@ outputs:
pacemaker_cluster: state=online
- name: Check pacemaker resource
tags: step4
- pacemaker_resource: state=started resource={{item}} check_mode=true wait_for_resource=true timeout=500
+ pacemaker_is_active:
+ resource: "{{ item }}"
+ max_wait: 500
with_items: {get_param: PacemakerResources}