Merge "Move magnum precheck into its own role"

This commit is contained in:
Jenkins 2017-01-11 10:13:34 +00:00 committed by Gerrit Code Review
commit f8f1faca4a
3 changed files with 26 additions and 20 deletions

View File

@ -179,6 +179,17 @@
- "{{ 'ironic_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Magnum API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ magnum_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_magnum | bool
- "{{ 'magnum_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Manila API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

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

View File

@ -143,26 +143,6 @@
- enable_iscsid | bool
- inventory_hostname in groups['tgtd']
- name: Checking free port for Magnum API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ magnum_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_magnum | bool
- inventory_hostname in groups['magnum-api']
- name: Checking free port for Magnum API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ magnum_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_magnum | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for MariaDB
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"