Merge "Don't check haproxy if external load-balancer is used."

This commit is contained in:
Jenkins 2017-03-31 22:53:10 +00:00 committed by Gerrit Code Review
commit 2f9a76c5a2
1 changed files with 13 additions and 1 deletions

View File

@ -87,10 +87,16 @@ parameters:
\[(?<pid>[^ ]*)\] \[(?<pid>[^ ]*)\]
(?<host>[^ ]*) (?<host>[^ ]*)
(?<message>.*)$/ (?<message>.*)$/
EnableLoadBalancer:
default: true
description: Whether to deploy a LoadBalancer on the Controller
type: boolean
PacemakerResources: PacemakerResources:
type: comma_delimited_list type: comma_delimited_list
description: List of resources managed by pacemaker description: List of resources managed by pacemaker
default: ['rabbitmq','haproxy','galera'] default: ['rabbitmq', 'galera']
outputs: outputs:
role_data: role_data:
@ -147,3 +153,9 @@ outputs:
resource: "{{ item }}" resource: "{{ item }}"
max_wait: 500 max_wait: 500
with_items: {get_param: PacemakerResources} with_items: {get_param: PacemakerResources}
- name: Check pacemaker haproxy resource
tags: step4
pacemaker_is_active:
resource: haproxy
max_wait: 500
when: {get_param: EnableLoadBalancer}