Move neutron precheck into its own role

Change-Id: I6f130a3fb5cebd9f96c81cac26ed08b7363aa7e5
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-12-29 08:00:51 +08:00
parent 9d3a60ecf9
commit e896666cd5
3 changed files with 26 additions and 20 deletions

View File

@ -113,6 +113,17 @@
- "{{ 'manila_api' not in haproxy_stat }}" - "{{ 'manila_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for Neutron Server HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ neutron_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_neutron | bool
- "{{ 'neutron_server' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Sahara API HAProxy - name: Checking free port for Sahara 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:
- neutron_server
register: container_facts
- name: Checking free port for Neutron Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ neutron_server_port }}"
connect_timeout: 1
state: stopped
when:
- container_facts['neutron_server'] is not defined
- inventory_hostname in groups['neutron-server']

View File

@ -353,26 +353,6 @@
- enable_murano | bool - enable_murano | bool
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for Neutron Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ neutron_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_neutron | bool
- inventory_hostname in groups['neutron-server']
- name: Checking free port for Neutron Server HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ neutron_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_neutron | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Nova API - name: Checking free port for Nova API
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"