Move searchlight precheck into its own role

Change-Id: Ieb40c72bec3b1700e036b8b6ac92a27ff8802783
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-12-27 15:38:15 +08:00
parent 02d9de8636
commit e44d575024
3 changed files with 26 additions and 20 deletions

View File

@ -223,6 +223,17 @@
- "{{ 'sahara_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Searchlight API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ searchlight_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_searchlight | bool
- "{{ 'searchlight_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Senlin API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

@ -539,23 +539,3 @@
when:
- enable_ceph_rgw | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Searchlight API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ searchlight_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_searchlight | bool
- inventory_hostname in groups['searchlight-api']
- name: Checking free port for Searchlight API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ searchlight_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_searchlight | bool
- inventory_hostname in groups['haproxy']

View File

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