← Back to branch summary

~corey.bryant/charms/trusty/swift-proxy/mitaka-ch-sync

« back to all changes in this revision

Viewing changes to templates/havana/proxy-server.conf

  • Committer: James Page
  • Date: 2014-03-07 10:13:22 UTC
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: james.page@canonical.com-20140307101322-4ml4uvw4uteufq2q
Renable s3token for icehouse now that keystoneclient is fixed

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/havana/proxy-server.conf
9
9
 
10
10
{% if auth_type == 'keystone' %}
11
11
[pipeline:main]
12
 
pipeline =  healthcheck cache swift3 s3token authtoken keystone container-quotas account-quotas proxy-server
 
12
pipeline =  healthcheck cache swift3 authtoken keystoneauth container-quotas account-quotas proxy-server
13
13
{% else %}
14
14
[pipeline:main]
15
15
pipeline = healthcheck cache tempauth container-quotas account-quotas proxy-server
56
56
cache = swift.cache
57
57
 
58
58
[filter:s3token]
59
 
paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory
 
59
paste.filter_factory = keystone.middleware.s3_token:filter_factory
60
60
service_host = {{ keystone_host }}
61
61
service_port = {{ service_port }}
62
62
auth_port = {{ auth_port }}