Move ironic precheck into its own role

Change-Id: Iba8a87757ac9ead27c90c9d426977077d442a04e
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-12-28 23:00:37 +08:00
parent b609134e58
commit efb0561930
3 changed files with 26 additions and 20 deletions

View File

@ -91,6 +91,17 @@
- "{{ '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 Ironic HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ ironic_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_ironic | bool
- "{{ 'ironic_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 }}"

View File

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

View File

@ -173,26 +173,6 @@
- enable_haproxy | bool - enable_haproxy | bool
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for Ironic
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ ironic_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_ironic | bool
- inventory_hostname in groups['ironic-api']
- name: Checking free port for Ironic HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ ironic_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_ironic | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Influxdb Admin - name: Checking free port for Influxdb Admin
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"