From 95343d26c8d2cc9789b87a77748b3e7becd548ca Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Fri, 18 Sep 2015 14:55:04 +0800
Subject: separate the mgmt vip from public vip, remove HA_VIP

Change-Id: Iaa877b7ce93ba9c12bc9be6f3bd101779f07ae9c
JIRA: COMPASS-51
---
 .../adapters/ansible/roles/ha/templates/haproxy.cfg  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'deploy/adapters/ansible/roles/ha/templates/haproxy.cfg')

diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
index 169182da..3c18d362 100644
--- a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
@@ -26,7 +26,7 @@ defaults
     retries 5
 
 listen  proxy-glance_registry_cluster
-    bind {{ HA_VIP }}:9191
+    bind {{ internal_vip.ip }}:9191
     option tcpka
     option tcplog
     balance source
@@ -35,7 +35,7 @@ listen  proxy-glance_registry_cluster
 {% endfor %}
 
 listen  proxy-glance_api_cluster
-    bind {{ HA_VIP }}:9292
+    bind {{ internal_vip.ip }}:9292
     option tcpka
     option httpchk
     option tcplog
@@ -45,7 +45,7 @@ listen  proxy-glance_api_cluster
 {% endfor %}
 
 listen  proxy-nova-novncproxy
-    bind {{ HA_VIP }}:6080
+    bind {{ internal_vip.ip }}:6080
     option tcpka
     option tcplog
     balance source
@@ -54,7 +54,7 @@ listen  proxy-nova-novncproxy
 {% endfor %}
 
 listen  proxy-network
-    bind {{ HA_VIP }}:9696
+    bind {{ internal_vip.ip }}:9696
     option tcpka
     option tcplog
     balance source
@@ -63,7 +63,7 @@ listen  proxy-network
 {% endfor %}
 
 listen  proxy-volume
-    bind {{ HA_VIP }}:8776
+    bind {{ internal_vip.ip }}:8776
     option tcpka
     option httpchk
     option tcplog
@@ -73,7 +73,7 @@ listen  proxy-volume
 {% endfor %}
 
 listen  proxy-keystone_admin_cluster
-    bind {{ HA_VIP }}:35357
+    bind {{ internal_vip.ip }}:35357
     option tcpka
     option httpchk
     option tcplog
@@ -83,7 +83,7 @@ listen  proxy-keystone_admin_cluster
 {% endfor %}
 
 listen  proxy-keystone_public_internal_cluster
-    bind {{ HA_VIP }}:5000
+    bind {{ internal_vip.ip }}:5000
     option tcpka
     option httpchk
     option tcplog
@@ -93,7 +93,7 @@ listen  proxy-keystone_public_internal_cluster
 {% endfor %}
 
 listen  proxy-nova_compute_api_cluster
-    bind {{ HA_VIP }}:8774
+    bind {{ internal_vip.ip }}:8774
     mode tcp
     option httpchk
     option tcplog
@@ -103,7 +103,7 @@ listen  proxy-nova_compute_api_cluster
 {% endfor %}
 
 listen  proxy-nova_metadata_api_cluster
-    bind {{ HA_VIP }}:8775
+    bind {{ internal_vip.ip }}:8775
     option tcpka
     option tcplog
     balance source
@@ -112,7 +112,7 @@ listen  proxy-nova_metadata_api_cluster
 {% endfor %}
 
 listen  proxy-cinder_api_cluster
-    bind {{ HA_VIP }}:8776
+    bind {{ internal_vip.ip }}:8776
     mode tcp
     option httpchk
     option tcplog
-- 
cgit 1.2.3-korg