Merge "Move horizon precheck into its own role"

This commit is contained in:
Jenkins 2017-01-03 02:40:08 +00:00 committed by Gerrit Code Review
commit fca27bf0bf
3 changed files with 26 additions and 24 deletions

View File

@ -80,6 +80,17 @@
- "{{ 'heat_api_cfn' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Horizon HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "80"
connect_timeout: 1
state: stopped
when:
- enable_horizon | bool
- "{{ 'horizon' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for watcher API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

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

View File

@ -193,30 +193,6 @@
- enable_haproxy | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Horizon
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "80"
connect_timeout: 1
state: stopped
when:
- enable_horizon | bool
- inventory_hostname in groups['horizon']
- name: Checking free port for Horizon HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "80"
connect_timeout: 1
state: stopped
when:
- enable_horizon | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Ironic
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"