openstack
/
charm-swift-proxy
Code Issues Proposed changes

Add service protocol config as well

This commit is contained in:
James Page 2014-02-27 12:17:53 +00:00
parent 46e94a6bf2
commit 0bda3aeaeb
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/swift_context.py
View File

@ -168,6 +168,8 @@ class SwiftIdentityContext(OSContextGenerator):
'auth_type': 'keystone',
'auth_protocol': relation_get('auth_protocol',
unit, relid),
'service_protocol': relation_get('service_protocol',
unit, relid),
'keystone_host': relation_get('auth_host',
unit, relid),
'auth_port': relation_get('auth_port',

1
templates/essex/proxy-server.conf
View File

@ -56,6 +56,7 @@ delay_auth_decision = 0
paste.filter_factory = keystone.middleware.s3_token:filter_factory
service_host = {{ keystone_host }}
service_port = {{ service_port }}
service_protocol = {{ service_protocol }}
auth_port = {{ auth_port }}
auth_host = {{ keystone_host }}
auth_protocol = {{ auth_protocol }}

1
templates/grizzly/proxy-server.conf
View File

@ -52,6 +52,7 @@ signing_dir = /etc/swift
paste.filter_factory = keystone.middleware.s3_token:filter_factory
service_host = {{ keystone_host }}
service_port = {{ service_port }}
service_protocol = {{ service_protocol }}
auth_port = {{ auth_port }}
auth_host = {{ keystone_host }}
auth_protocol = {{ auth_protocol }}

1
templates/havana/proxy-server.conf
View File

@ -53,6 +53,7 @@ cache = swift.cache
paste.filter_factory = keystone.middleware.s3_token:filter_factory
service_host = {{ keystone_host }}
service_port = {{ service_port }}
service_protocol = {{ service_protocol }}
auth_port = {{ auth_port }}
auth_host = {{ keystone_host }}
auth_protocol = {{ auth_protocol }}