From 1c246219be2a8ad4d25447a1195acce7c6426b6f Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Mon, 2 Jan 2017 21:21:33 +0800
Subject: [PATCH] Move sahara precheck into its own role
Change-Id: I58d86ffb8001f54a3748fcd7fbabfeb5b873102c
Partially-implements: blueprint condition-pre-check
---
ansible/roles/haproxy/tasks/precheck.yml | 11 ++++++++++
ansible/roles/prechecks/tasks/port_checks.yml | 20 -------------------
ansible/roles/sahara/tasks/precheck.yml | 15 ++++++++++++++
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index 0d5972e777..79d768cd01 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -101,3 +101,14 @@
- enable_manila | bool
- "{{ 'manila_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
+
+- name: Checking free port for Sahara API HAProxy
+ wait_for:
+ host: "{{ kolla_internal_vip_address }}"
+ port: "{{ sahara_api_port }}"
+ connect_timeout: 1
+ state: stopped
+ when:
+ - enable_sahara | bool
+ - "{{ 'sahara_api' not in haproxy_stat }}"
+ - inventory_hostname in groups['haproxy']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index b2427d8869..6ee3182933 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -163,26 +163,6 @@
- enable_kuryr | bool
- inventory_hostname in groups['compute']
-- name: Checking free port for Sahara API
- wait_for:
- host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
- port: "{{ sahara_api_port }}"
- connect_timeout: 1
- state: stopped
- when:
- - enable_sahara | bool
- - inventory_hostname in groups['sahara-api']
-
-- name: Checking free port for Sahara API HAProxy
- wait_for:
- host: "{{ kolla_internal_vip_address }}"
- port: "{{ sahara_api_port }}"
- connect_timeout: 1
- state: stopped
- when:
- - enable_sahara | bool
- - inventory_hostname in groups['haproxy']
-
- name: Checking free port for HAProxy stats
wait_for:
host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/sahara/tasks/precheck.yml b/ansible/roles/sahara/tasks/precheck.yml
index ed97d539c0..918d3c513d 100644
--- a/ansible/roles/sahara/tasks/precheck.yml
+++ b/ansible/roles/sahara/tasks/precheck.yml
@@ -1 +1,16 @@
---
+- name: Get container facts
+ kolla_container_facts:
+ name:
+ - sahara_api
+ register: container_facts
+
+- name: Checking free port for Sahara API
+ wait_for:
+ host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+ port: "{{ sahara_api_port }}"
+ connect_timeout: 1
+ state: stopped
+ when:
+ - container_facts['sahara_api'] is not defined
+ - inventory_hostname in groups['sahara-api']