diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-31 22:53:10 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-31 22:53:10 +0000 |
commit | 2f9a76c5a21ab2ed63b693072604f18961e4b213 (patch) | |
tree | e2aea56d060236975ef5103b644a785eaaab2620 /puppet/services | |
parent | 29a0754982d9ce855fba6fa021a8da61b625c6ad (diff) | |
parent | 56535c89ad6a5db718dc0fb89c19dda9fba251ca (diff) |
Merge "Don't check haproxy if external load-balancer is used."
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/pacemaker.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml index 762d0092..28fcbd6f 100644 --- a/puppet/services/pacemaker.yaml +++ b/puppet/services/pacemaker.yaml @@ -87,10 +87,16 @@ parameters: \[(?<pid>[^ ]*)\] (?<host>[^ ]*) (?<message>.*)$/ + + EnableLoadBalancer: + default: true + 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','haproxy','galera'] + default: ['rabbitmq', 'galera'] outputs: role_data: @@ -147,3 +153,9 @@ outputs: 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} |