Move senlin precheck into its own role

Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>

Change-Id: Id0a941ad5b15c33034b93e19d10cc995e8520945
Partially-implements: blueprint condition-pre-check
This commit is contained in:
caoyuan 2016-12-28 23:15:24 +08:00
parent 8fdfc403ea
commit b08e4f9ed1
3 changed files with 26 additions and 20 deletions

View File

@ -157,6 +157,17 @@
- "{{ 'sahara_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 }}"
port: "{{ senlin_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_senlin | bool
- "{{ 'senlin_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Tacker Server HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"

View File

@ -640,26 +640,6 @@
- enable_grafana | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Senlin API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
port: "{{ senlin_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_senlin | bool
- inventory_hostname in groups['senlin-api']
- name: Checking free port for Senlin API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ senlin_api_port }}"
connect_timeout: 1
state: stopped
when:
- enable_senlin | bool
- inventory_hostname in groups['haproxy']
- name: Checking free port for Mistral API
wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"

View File

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