diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml index f0520f551d..a0f618fb18 100644 --- a/ansible/roles/haproxy/tasks/precheck.yml +++ b/ansible/roles/haproxy/tasks/precheck.yml @@ -46,3 +46,14 @@ - enable_watcher | bool - "{{ 'watcher_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 }}" + port: "{{ manila_api_port }}" + connect_timeout: 1 + state: stopped + when: + - enable_manila | bool + - "{{ 'manila_api' not in haproxy_stat }}" + - inventory_hostname in groups['haproxy'] diff --git a/ansible/roles/manila/tasks/precheck.yml b/ansible/roles/manila/tasks/precheck.yml index ed97d539c0..df35711060 100644 --- a/ansible/roles/manila/tasks/precheck.yml +++ b/ansible/roles/manila/tasks/precheck.yml @@ -1 +1,16 @@ --- +- name: Get container facts + kolla_container_facts: + name: + - manila_api + register: container_facts + +- name: Checking free port for Manila API + wait_for: + host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" + port: "{{ manila_api_port }}" + connect_timeout: 1 + state: stopped + when: + - container_facts['manila_api'] is not defined + - inventory_hostname in groups['manila-api'] diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml index be8131078e..c61c639733 100644 --- a/ansible/roles/prechecks/tasks/port_checks.yml +++ b/ansible/roles/prechecks/tasks/port_checks.yml @@ -453,26 +453,6 @@ - enable_mariadb | bool - inventory_hostname in groups['mariadb'] -- name: Checking free port for Manila API - wait_for: - host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" - port: "{{ manila_api_port }}" - connect_timeout: 1 - state: stopped - when: - - enable_manila | bool - - inventory_hostname in groups['manila-api'] - -- name: Checking free port for Manila API HAProxy - wait_for: - host: "{{ kolla_internal_vip_address }}" - port: "{{ manila_api_port }}" - connect_timeout: 1 - state: stopped - when: - - enable_manila | bool - - inventory_hostname in groups['haproxy'] - - name: Checking free port for Memcached wait_for: host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"