From 5fc82bbde0f54b95da1ff64e59151157ce2be62f Mon Sep 17 00:00:00 2001 From: caoyuan Date: Mon, 2 Jan 2017 22:04:03 +0800 Subject: [PATCH] Move memcached precheck into its own role Change-Id: Ib14471c9cdbd3dee000594d3ca87a6c0b487ad3e Partially-implements: blueprint condition-pre-check --- ansible/roles/memcached/tasks/precheck.yml | 15 +++++++++++++++ ansible/roles/prechecks/tasks/port_checks.yml | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ansible/roles/memcached/tasks/precheck.yml b/ansible/roles/memcached/tasks/precheck.yml index ed97d539c0..577f26c182 100644 --- a/ansible/roles/memcached/tasks/precheck.yml +++ b/ansible/roles/memcached/tasks/precheck.yml @@ -1 +1,16 @@ --- +- name: Get container facts + kolla_container_facts: + name: + - memcached + register: container_facts + +- name: Checking free port for Memcached + wait_for: + host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" + port: "{{ memcached_port }}" + connect_timeout: 1 + state: stopped + when: + - container_facts['memcached'] is not defined + - inventory_hostname in groups['memcached'] diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml index b2427d8869..52e3b283c7 100644 --- a/ansible/roles/prechecks/tasks/port_checks.yml +++ b/ansible/roles/prechecks/tasks/port_checks.yml @@ -377,16 +377,6 @@ - enable_mariadb | bool - inventory_hostname in groups['mariadb'] -- name: Checking free port for Memcached - wait_for: - host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" - port: "{{ memcached_port }}" - connect_timeout: 1 - state: stopped - when: - - enable_memcached | bool - - inventory_hostname in groups['memcached'] - - name: Checking free port for Murano API wait_for: host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"