openstack
/
charm-swift-proxy
Code Issues Proposed changes

Remove deprecated config

This commit is contained in:
James Page 2015-03-25 08:52:36 +00:00
parent c31e0bc9c2
commit e1222c7433
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/kilo/proxy-server.conf
View File

@ -76,7 +76,6 @@ auth_uri = {{ service_protocol }}://{{ service_protocol }}:{{ service_port }}
admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_user }}
admin_password = {{ service_password }}
admin_token = {{ admin_token }}
delay_auth_decision = {{ delay_auth_decision|lower }}
signing_dir = {{ signing_dir }}
cache = swift.cache
@ -85,8 +84,9 @@ cache = swift.cache
paste.filter_factory = keystonemiddleware.s3_token:filter_factory
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
auth_uri = {{ service_protocol }}://{{ service_protocol }}:{{ service_port }}
auth_token = {{ admin_token }}
admin_token = {{ admin_token }}
admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_user }}
admin_password = {{ service_password }}
[filter:swift3]
use = egg:swift3#swift3