summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-02-27 18:59:51 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-04 15:34:40 +0000
commit36d8ea460afbf66e884ba44b5a2a49695ec67cb9 (patch)
tree33983781cafc8b4538986116733066c6e4d16675 /openstack
parent42f4251668c27a288a6716a170eacc3539ae374c (diff)
downloaddefinitions-36d8ea460afbf66e884ba44b5a2a49695ec67cb9.tar.gz
Add openstack.configure
Diffstat (limited to 'openstack')
-rw-r--r--openstack/etc/swift/proxy-server.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/etc/swift/proxy-server.conf b/openstack/etc/swift/proxy-server.conf
index 7399175d..c2c1285a 100644
--- a/openstack/etc/swift/proxy-server.conf
+++ b/openstack/etc/swift/proxy-server.conf
@@ -4,7 +4,7 @@ bind_port = 8080
# bind_timeout = 30
# backlog = 4096
swift_dir = /etc/swift
-user = swift
+user = ##SWIFT_ADMIN_USER##
# Enables exposing configuration settings via HTTP GET /info.
# expose_info = true
@@ -274,7 +274,7 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
# auth_uri = http://keystonehost:5000/
#auth_uri = http://controller:5000/v2.0
auth_uri = ##KEYSTONE_INTERNAL_URL##
-#identity_uri = http://controller:35357
+identity_uri = http://controller:35357
admin_tenant_name = service
admin_user = ##SWIFT_ADMIN_USER##
admin_password = ##SWIFT_ADMIN_PASSWORD##