diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-13 12:20:20 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-13 12:20:20 +0000 |
commit | b69a73ba85682629460638aa7a8b8f5825c99a1f (patch) | |
tree | 37f79ef63312604bae7be42137c5b973b9b07996 /puppet/services | |
parent | 5fb25c2c4a633638731f5725ddf5b6a397aabbf8 (diff) | |
parent | 841d30549bd27a8b5669955196e14085025dafad (diff) |
Merge "Upgrades: wait for galera to be settled"
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/pacemaker.yaml | 6 |
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} |