Move kibana precheck into its own role

Co-Authored-By: caoyuan <cao.yuan@99cloud.net>

Change-Id: I38aa833febe7bf06bffb9c5e8ad6b7a79074fb50
Partially-implements: blueprint condition-pre-check
This commit is contained in:
qiankun.zhang 2017-01-11 18:43:11 +08:00 committed by caoyuan
parent adaabb9c4d
commit 2d8d6e72ea
3 changed files with 26 additions and 10 deletions

View File

@ -179,6 +179,17 @@
- "{{ 'ironic_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Kibana HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ kibana_server_port }}"
connect_timeout: 1
state: stopped
when:
- enable_kibana | bool
- "{{ 'kibana' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Magnum API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

@ -1 +1,16 @@
---
- name: Get container facts
kolla_container_facts:
name:
- kibana
register: container_facts
- name: Checking free port for Kibana Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
port: "{{ kibana_server_port }}"
connect_timeout: 1
state: stopped
when:
- container_facts['kibana'] is not defined
- inventory_hostname in groups['kibana']

View File

@ -306,16 +306,6 @@
- inventory_hostname in groups['haproxy']
- enable_mongodb | bool
- name: Checking free port for Kibana Server
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
port: "{{ kibana_server_port }}"
connect_timeout: 1
state: stopped
when:
- inventory_hostname in groups['kibana']
- enable_kibana | bool
- name: Checking free port for Rsync
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"