Move barbican precheck into its own role

Change-Id: I823f1a5e2e529037d0adf7edd6e407faa629e940
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-11-30 07:09:39 +08:00
parent f3f2a215bc
commit 8fdc01f197
3 changed files with 26 additions and 20 deletions

View File

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

View File

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

View File

@ -53,26 +53,6 @@
- enable_aodh | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Barbican API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ barbican_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_barbican | bool
- inventory_hostname in groups['barbican-api']
- name: Checking free port for Barbican API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ barbican_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_barbican | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Ceilometer API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"