Merge "Move tacker precheck into its own role"

This commit is contained in:
Jenkins 2017-01-06 17:02:06 +00:00 committed by Gerrit Code Review
commit 298483cf26
3 changed files with 26 additions and 20 deletions

View File

@ -157,6 +157,17 @@
- "{{ 'sahara_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Tacker Server HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ tacker_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_tacker | bool
- "{{ 'tacker_server' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Trove API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

@ -699,23 +699,3 @@
when:
- enable_searchlight | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Tacker Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ tacker_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_tacker | bool
- inventory_hostname in groups['tacker']
- name: Checking free port for Tacker Server HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ tacker_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_tacker | bool
- inventory_hostname in groups['haproxy']

View File

@ -1 +1,16 @@
---
- name: Get container facts
kolla_container_facts:
name:
- tacker
register: container_facts
- name: Checking free port for Tacker Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ tacker_server_port }}"
connect_timeout: 1
state: stopped
when:
- container_facts['tacker'] is not defined
- inventory_hostname in groups['tacker']