From bc8dcd1054f95620d69c4595eebb9157df9c7e7b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 28 Feb 2017 13:25:59 +0100 Subject: 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/ D-O is needed for upgrades to work against stable/* branches. Depends-On: I712abe71f97c22ee3d55d9db2f641096f8a7350c Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd Closes-Bug: #1668372 (cherry picked from commit 841d30549bd27a8b5669955196e14085025dafad) --- puppet/services/pacemaker.yaml | 6 ++++-- 1 file 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} -- cgit 1.2.3-korg