From 37b0c1baa4c4da640cfd9b7693b252cc2e0015d5 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Tue, 3 Jan 2017 17:42:24 +0800
Subject: [PATCH] Update the place of Watcher HAProxy by alphabet
TrivialFix
Change-Id: I3970a414d6a6a2817d7aa59a444b0197b91a9142
---
ansible/roles/haproxy/tasks/precheck.yml | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml
index 22dafd1a9e..b9dbf33582 100644
--- a/ansible/roles/haproxy/tasks/precheck.yml
+++ b/ansible/roles/haproxy/tasks/precheck.yml
@@ -91,17 +91,6 @@
- "{{ 'horizon' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
-- name: Checking free port for watcher API HAProxy
- wait_for:
- host: "{{ kolla_internal_vip_address }}"
- port: "{{ watcher_api_port }}"
- connect_timeout: 1
- state: stopped
- when:
- - 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 }}"
@@ -123,3 +112,15 @@
- enable_sahara | bool
- "{{ 'sahara_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 }}"
+ port: "{{ watcher_api_port }}"
+ connect_timeout: 1
+ state: stopped
+ when:
+ - enable_watcher | bool
+ - "{{ 'watcher_api' not in haproxy_stat }}"
+ - inventory_hostname in groups['haproxy']
+
--
GitLab