From 8fdc01f1972fde9300614485ae602fa58bb904e7 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Wed, 30 Nov 2016 07:09:39 +0800
Subject: [PATCH] Move barbican precheck into its own role

Change-Id: I823f1a5e2e529037d0adf7edd6e407faa629e940
Partially-implements: blueprint condition-pre-check
---
 ansible/roles/barbican/tasks/precheck.yml     | 15 ++++++++++++++
 ansible/roles/haproxy/tasks/precheck.yml      | 11 ++++++++++
 ansible/roles/prechecks/tasks/port_checks.yml | 20 -------------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ansible/roles/barbican/tasks/precheck.yml b/ansible/roles/barbican/tasks/precheck.yml
index ed97d539c0..6a71e74224 100644
--- a/ansible/roles/barbican/tasks/precheck.yml
+++ b/ansible/roles/barbican/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - barbican_api
+  register: container_facts
+
+- name: Checking free port for Barbican API
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ barbican_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['barbican_api'] is not defined
+    - inventory_hostname in groups['barbican-api']
diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index a9d9b31d1a..8a68c6c890 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -14,6 +14,17 @@
 - set_fact:
     haproxy_stat: "{{ haproxy_stat_shell.stdout|default('') }}"
 
+- name: Checking free port for Barbican API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ barbican_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_barbican | bool
+    - "{{ 'barbican_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Cloudkitty 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 3177288c50..9e94f9065c 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -53,26 +53,6 @@
     - enable_aodh | bool
     - inventory_hostname in groups['haproxy']
 
-- name: Checking free port for Barbican API
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ barbican_api_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_barbican | bool
-    - inventory_hostname in groups['barbican-api']
-
-- name: Checking free port for Barbican API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ barbican_api_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_barbican | bool
-    - inventory_hostname in groups['haproxy']
-
 - name: Checking free port for Ceilometer API
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"