aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-07-28 05:45:04 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-07-28 05:45:46 -0400
commit26c7dfdd7300b99c00b97acbf90f96648acd278b (patch)
tree5a1d3402779de297829ee04e8c12403026d18a13
parent9e6d6e9715bf4c1e772b74d3886eea88860526f4 (diff)
add swift ha mode
JIRA: COMPASS-443 Change-Id: If758575b6e653edbedbb2e467a335d7341653e84 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml2
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf3
2 files changed, 2 insertions, 3 deletions
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