Merge "Move trove precheck into its own role"

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 Trove API HAProxy
+  wait_for:
+    host: "{{ kolla_internal_vip_address }}"
+    port: "{{ trove_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - enable_trove | bool
+    - "{{ 'trove_api' not in haproxy_stat }}"
+    - inventory_hostname in groups['haproxy']
+
 - name: Checking free port for Watcher API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"
@@ -134,4 +145,3 @@
     - enable_watcher | bool
     - "{{ 'watcher_api' not in haproxy_stat }}"
     - inventory_hostname in groups['haproxy']
-

ansible/roles/trove/tasks/precheck.yml

@@ -1 +1,16 @@
 ---
+- name: Get container facts
+  kolla_container_facts:
+    name:
+      - trove_api
+  register: container_facts
+
+- name: Checking free port for Trove API
+  wait_for:
+    host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
+    port: "{{ trove_api_port }}"
+    connect_timeout: 1
+    state: stopped
+  when:
+    - container_facts['trove_api'] is not defined
+    - inventory_hostname in groups['trove-api']