Move cloudkitty precheck into its own role

Change-Id: Ic9bc03de9636a357cc414897976cb91db44ad02b
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-12-23 11:03:09 +08:00
parent 3e964a157b
commit c7dd8309f3
3 changed files with 26 additions and 20 deletions

View File

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

View File

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

View File

@ -133,26 +133,6 @@
- enable_cinder | bool - enable_cinder | bool
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- name: Checking free port for Cloudkitty API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ cloudkitty_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_cloudkitty | bool
- inventory_hostname in groups['cloudkitty-api']
- name: Checking free port for Cloudkitty API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ cloudkitty_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_cloudkitty | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Etcd Peer - name: Checking free port for Etcd Peer
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"