summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-03 06:35:55 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-08-03 10:11:33 -0400
commit0d57b886e0db03377d9ae60af0372310b835b749 (patch)
treeec1e4272ddbc84bfc33ce80d640df9fb0e22e15e /deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon
parent89fecf5c0dbc5926c2baa8f9518c9bc33de264eb (diff)
bugfix for moon and swift
JIRA: COMPASS-460 Change-Id: I1f70cc0c9ae9285b887b490f964964781571b98d Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf
index db2ee145..9bea7a8e 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf
@@ -324,6 +324,9 @@ project_name = service
username = swift
password = {{ CINDER_PASS }}
delay_auth_decision = True
+admin_user=admin
+admin_password={{ ADMIN_PASS }}
+admin_token={{ ADMIN_TOKEN }}
#
# delay_auth_decision defaults to False, but leaving it as false will
# prevent other auth systems, staticweb, tempurl, formpost, and ACLs from
@@ -767,5 +770,6 @@ use = egg:swift#versioned_writes
[filter:moon]
paste.filter_factory = keystonemiddleware.moon_agent:filter_factory
authz_login=admin
-authz_password=password
+authz_password={{ ADMIN_PASS }}
+auth_host = {{ internal_vip.ip }}
logfile=/var/log/moon/keystonemiddleware.log