From f386c19283bc38c2b30e17887f8804e1b4e4bb9f Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Wed, 28 Dec 2016 18:04:44 +0100
Subject: [PATCH] Move magnum precheck into its own role

Co-Authored-By: caoyuan <cao.yuan@99cloud.net>

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

diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index 4a0bae697c..6c45d2bf38 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -124,6 +124,17 @@
     - "{{ 'ironic_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for Magnum API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ magnum_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_magnum | bool
+    - "{{ 'magnum_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Manila API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/magnum/tasks/precheck.yml b/ansible/roles/magnum/tasks/precheck.yml
index ed97d539c0..1510d9478a 100644
--- a/ansible/roles/magnum/tasks/precheck.yml
+++ b/ansible/roles/magnum/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - magnum_api
+  register: container_facts
+
+- name: Checking free port for Magnum API
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ magnum_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['magnum_api'] is not defined
+    - inventory_hostname in groups['magnum-api']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index 6ed52d17db..21f09f5307 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -223,26 +223,6 @@
     - enable_iscsid | bool
     - inventory_hostname in groups['tgtd']
 
-- name: Checking free port for Magnum API
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ magnum_api_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_magnum | bool
-    - inventory_hostname in groups['magnum-api']
-
-- name: Checking free port for Magnum API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ magnum_api_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_magnum | bool
-    - inventory_hostname in groups['haproxy']
-
 - name: Checking free port for MariaDB
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"