From: chenshuai@huawei.com <chenshuai@huawei.com>
Date: Thu, 28 Jul 2016 09:45:04 +0000 (-0400)
Subject: add swift ha mode
X-Git-Tag: colorado.1.0~65
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=26c7dfdd7300b99c00b97acbf90f96648acd278b;p=compass4nfv.git

add swift ha mode

JIRA: COMPASS-443

Change-Id: If758575b6e653edbedbb2e467a335d7341653e84
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
---

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
index 61cf1c69..c0e54b71 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
@@ -97,7 +97,7 @@
 #    - ext-network
     - dashboard
     - heat
-    - aodh
+#    - aodh
 
 - hosts: all
   remote_user: root
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
index 4efdfcee..173525ab 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
@@ -3,9 +3,8 @@
 {% set _ = memcached_servers.append('%s:11211'% host) %}
 {% endfor %}
 {% set memcached_servers = memcached_servers|join(',') %}
-
 [DEFAULT]
-# bind_ip = 0.0.0.0
+bind_ip = {{ internal_ip }}
 bind_port = 8080
 # bind_timeout = 30
 # backlog = 4096