Merge "Update the place of Watcher HAProxy by alphabet"

This commit is contained in:
Jenkins 2017-01-03 19:41:12 +00:00 committed by Gerrit Code Review
commit b609134e58

View File

@ -91,17 +91,6 @@
- "{{ 'horizon' not in haproxy_stat }}" - "{{ 'horizon' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for watcher API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ watcher_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_watcher | bool
- "{{ 'watcher_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Manila API HAProxy - name: Checking free port for Manila API HAProxy
wait_for: wait_for:
host: "{{ kolla_internal_vip_address }}" host: "{{ kolla_internal_vip_address }}"
@ -123,3 +112,15 @@
- enable_sahara | bool - enable_sahara | bool
- "{{ 'sahara_api' not in haproxy_stat }}" - "{{ 'sahara_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for Watcher API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ watcher_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_watcher | bool
- "{{ 'watcher_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']