From e896666cd573b960c388ff80274bfec6fbaa1597 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Thu, 29 Dec 2016 08:00:51 +0800
Subject: [PATCH] Move neutron precheck into its own role

Change-Id: I6f130a3fb5cebd9f96c81cac26ed08b7363aa7e5
Partially-implements: blueprint condition-pre-check
---
 ansible/roles/haproxy/tasks/precheck.yml      | 11 ++++++++++
 ansible/roles/neutron/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 22dafd1a9e..7dd4e61d84 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -113,6 +113,17 @@
     - "{{ 'manila_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
 
+- name: Checking free port for Neutron Server HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ neutron_server_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_neutron | bool
+    - "{{ 'neutron_server' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Sahara API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
diff --git a/ansible/roles/neutron/tasks/precheck.yml b/ansible/roles/neutron/tasks/precheck.yml
index ed97d539c0..fd696dfb1c 100644
--- a/ansible/roles/neutron/tasks/precheck.yml
+++ b/ansible/roles/neutron/tasks/precheck.yml
@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - neutron_server
+  register: container_facts
+
+- name: Checking free port for Neutron Server
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ neutron_server_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['neutron_server'] is not defined
+    - inventory_hostname in groups['neutron-server']
diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml
index 65d6146874..c62368f7a9 100644
--- a/ansible/roles/prechecks/tasks/port_checks.yml
+++ b/ansible/roles/prechecks/tasks/port_checks.yml
@@ -353,26 +353,6 @@
     - enable_murano | bool
     - inventory_hostname in groups['haproxy']
 
-- name: Checking free port for Neutron Server
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ neutron_server_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_neutron | bool
-    - inventory_hostname in groups['neutron-server']
-
-- name: Checking free port for Neutron Server HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ neutron_server_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_neutron | bool
-    - inventory_hostname in groups['haproxy']
-
 - name: Checking free port for Nova API
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"