From 5b1c6a47aa8d3b10dbda7c69932ceb5433458a71 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Mon, 2 Jan 2017 21:34:23 +0800
Subject: [PATCH] Move tacker precheck into its own role
Change-Id: I63f5247a01683cff416847c1856a24997bf8605c
Partially-implements: blueprint condition-pre-check
---
ansible/roles/haproxy/tasks/precheck.yml | 11 ++++++++++
ansible/roles/prechecks/tasks/port_checks.yml | 20 -------------------
ansible/roles/tacker/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 5367d9a9d2..7db8080dbe 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -124,6 +124,17 @@
- "{{ 'sahara_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 }}"
+ port: "{{ tacker_server_port }}"
+ connect_timeout: 1
+ state: stopped
+ when:
+ - enable_tacker | bool
+ - "{{ 'tacker_server' not in haproxy_stat }}"
+ - inventory_hostname in groups['haproxy']
+
- name: Checking free port for Trove API HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index f99dda4b32..69a1cb9c98 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -739,23 +739,3 @@
when:
- enable_searchlight | bool
- inventory_hostname in groups['haproxy']
-
-- name: Checking free port for Tacker Server
- wait_for:
- host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
- port: "{{ tacker_server_port }}"
- connect_timeout: 1
- state: stopped
- when:
- - enable_tacker | bool
- - inventory_hostname in groups['tacker']
-
-- name: Checking free port for Tacker Server HAProxy
- wait_for:
- host: "{{ kolla_internal_vip_address }}"
- port: "{{ tacker_server_port }}"
- connect_timeout: 1
- state: stopped
- when:
- - enable_tacker | bool
- - inventory_hostname in groups['haproxy']
diff --git a/ansible/roles/tacker/tasks/precheck.yml b/ansible/roles/tacker/tasks/precheck.yml
index ed97d539c0..875bf7a7dc 100644
--- a/ansible/roles/tacker/tasks/precheck.yml
+++ b/ansible/roles/tacker/tasks/precheck.yml
@@ -1 +1,16 @@
---
+- name: Get container facts
+ kolla_container_facts:
+ name:
+ - tacker
+ register: container_facts
+
+- name: Checking free port for Tacker Server
+ wait_for:
+ host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+ port: "{{ tacker_server_port }}"
+ connect_timeout: 1
+ state: stopped
+ when:
+ - container_facts['tacker'] is not defined
+ - inventory_hostname in groups['tacker']
--
GitLab