diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-02-27 17:20:24 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-04 15:34:40 +0000 |
commit | 42f4251668c27a288a6716a170eacc3539ae374c (patch) | |
tree | e79c6e9f591d2f6f36b712a28deef12be5c45e5e /openstack | |
parent | 8ab8635791ce97f4335961248efe9b4ba47db756 (diff) | |
download | definitions-42f4251668c27a288a6716a170eacc3539ae374c.tar.gz |
things we'll need
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/etc/swift/proxy-server.conf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openstack/etc/swift/proxy-server.conf b/openstack/etc/swift/proxy-server.conf index 24a8c32f..7399175d 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 |