summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-02-27 17:20:24 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-02-27 17:20:24 (GMT)
commit173e3ae18277b15dc90935a06e92d40d4d78dd17 (patch)
treeb05d87ae4036e0f0c7d1bca5b1b1731054dc515a
parenta9c18192d6df08b2b0490af81720c59f705dd1e9 (diff)
downloaddefinitions-173e3ae18277b15dc90935a06e92d40d4d78dd17.tar.gz
things we'll need
-rw-r--r--openstack/etc/swift/proxy-server.conf9
1 files changed, 5 insertions, 4 deletions
diff --git a/openstack/etc/swift/proxy-server.conf b/openstack/etc/swift/proxy-server.conf
index 24a8c32..7399175 100644
--- a/openstack/etc/swift/proxy-server.conf
+++ b/openstack/etc/swift/proxy-server.conf
@@ -272,11 +272,12 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
# auth_port = 35357
# auth_protocol = http
# auth_uri = http://keystonehost:5000/
-auth_uri = http://controller:5000/v2.0
-identity_uri = http://controller:35357
+#auth_uri = http://controller:5000/v2.0
+auth_uri = ##KEYSTONE_INTERNAL_URL##
+#identity_uri = http://controller:35357
admin_tenant_name = service
-admin_user = swift
-admin_password = insecure
+admin_user = ##SWIFT_ADMIN_USER##
+admin_password = ##SWIFT_ADMIN_PASSWORD##
delay_auth_decision = 1
# cache = swift.cache
# include_service_catalog = False