Move aodh precheck into its own role

Refer to https://review.openstack.org/#/c/399354/

Change-Id: I934ff074cb795b971f79ecce008931cc672f1932
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-11-30 03:00:34 +08:00
parent b8c0f25fec
commit 152ae97a76
3 changed files with 26 additions and 20 deletions

View File

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

View File

@ -14,6 +14,17 @@
- set_fact:
haproxy_stat: "{{ haproxy_stat_shell.stdout|default('') }}"
- name: Checking free port for Aodh API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ aodh_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_aodh | bool
- "{{ 'aodh_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Barbican API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

@ -33,26 +33,6 @@
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none"
when: enable_haproxy | bool
- name: Checking free port for Aodh API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ aodh_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_aodh | bool
- inventory_hostname in groups['aodh-api']
- name: Checking free port for Aodh API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ aodh_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_aodh | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Congress API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"