diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 13:03:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 13:03:57 +0000 |
| commit | 5cbcc8377c49e395dc1d02a976d9b4a94253f5ca (patch) | |
| tree | 62705cb711cc6e9c52da2fcec3ca5a62a30fea94 /puppet/services | |
| parent | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (diff) | |
| parent | cdc3477b7780c751807fe18c3767762189cf03b4 (diff) | |
Merge "Remove non-containerized pacemaker resources on upgrade"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/pacemaker.yaml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml index 893e8418..158d04bd 100644 --- a/puppet/services/pacemaker.yaml +++ b/puppet/services/pacemaker.yaml @@ -105,11 +105,6 @@ parameters: description: Whether to deploy a LoadBalancer on the Controller type: boolean - PacemakerResources: - type: comma_delimited_list - description: List of resources managed by pacemaker - default: ['rabbitmq', 'galera'] - outputs: role_data: description: Role data for the Pacemaker role. @@ -156,20 +151,8 @@ outputs: async: 30 poll: 4 - name: Stop pacemaker cluster - tags: step2 + tags: step3 pacemaker_cluster: state=offline - name: Start pacemaker cluster tags: step4 pacemaker_cluster: state=online - - name: Check pacemaker resource - tags: step4 - pacemaker_is_active: - resource: "{{ item }}" - max_wait: 500 - with_items: {get_param: PacemakerResources} - - name: Check pacemaker haproxy resource - tags: step4 - pacemaker_is_active: - resource: haproxy - max_wait: 500 - when: {get_param: EnableLoadBalancer} |