← Back to branch summary

~gnuoy/charms/trusty/swift-proxy/stable-charmhelper-sync

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2013-11-18 11:16:28 UTC
  • mfrom: (46.1.5 fix-templates)
  • Revision ID: james.page@canonical.com-20131118111628-lu2qje5j5y3w2v1l
[Michael Nelson] Fixup templates for essex release, add template unit tests for changes
[James Page] Add standard unit test fixtures for openstack charms

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/grizzly/proxy-server.conf
46
46
admin_user = {{ service_user }}
47
47
admin_password = {{ service_password }}
48
48
delay_auth_decision = {{ delay_auth_decision|lower }}
49
 
{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
 
49
signing_dir = /etc/swift
50
50
 
51
51
[filter:s3token]
52
52
paste.filter_factory = keystone.middleware.s3_token:filter_factory
59
59
admin_token = {{ admin_token }}
60
60
 
61
61
[filter:swift3]
62
 
{% if os_release == 'essex' %}use = egg:swift#swift3{% else %}use = egg:swift3#swift3
63
 
{% endif %}
 
62
use = egg:swift3#swift3
64
63
{% endif %}