Merge "Move Influxdb precheck into its own role"

ansible/roles/influxdb/tasks/precheck.yml

@@ -1 +1,26 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - influxdb
+  register: container_facts
+
+- name: Checking free port for Influxdb Admin
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ influxdb_admin_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['influxdb'] is not defined
+    - inventory_hostname in groups['influxdb']
+
+- name: Checking free port for Influxdb Http
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ influxdb_http_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['influxdb'] is not defined
+    - inventory_hostname in groups['influxdb']

ansible/roles/prechecks/tasks/port_checks.yml

@@ -43,26 +43,6 @@
     - enable_haproxy | bool
     - inventory_hostname in groups['haproxy']
 
-- name: Checking free port for Influxdb Admin
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ influxdb_admin_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_influxdb | bool
-    - inventory_hostname in groups['influxdb']
-
-- name: Checking free port for Influxdb Http
-  wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
-    port: "{{ influxdb_http_port }}"
-    connect_timeout: 1
-    state: stopped
-  when:
-    - enable_influxdb | bool
-    - inventory_hostname in groups['influxdb']
-
 - name: Checking free port for Keystone Admin
   wait_for:
     host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"