openstack/charm-swift-proxy
Code Issues Proposed changes

Add option for delayed auth decision, defaulting to True.

Browse Source
This commit is contained in:
Adam Gandelman
2013-04-10 21:27:47 -07:00
parent c734283c43
commit 772e53ed78
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@@ -102,6 +102,10 @@ options:
default: tempauth default: tempauth
type: string type: string
description: Auth method to use, tempauth or keystone description: Auth method to use, tempauth or keystone
delay-auth-decision:
default: "True"
type: string
description: Delay authentication to downstream WSGI services.
# Manual Keystone configuration. # Manual Keystone configuration.
keystone-auth-host: keystone-auth-host:
type: string type: string

3
hooks/swift_utils.py
View File

@@ -196,7 +196,8 @@ def write_proxy_config():
'proxy_ip': utils.get_host_ip(), 'proxy_ip': utils.get_host_ip(),
'bind_port': cluster.determine_api_port(bind_port), 'bind_port': cluster.determine_api_port(bind_port),
'workers': workers, 'workers': workers,
'operator_roles': utils.config_get('operator-roles') 'operator_roles': utils.config_get('operator-roles'),
'delay_auth_decision': utils.config_get('delay-auth-decision')
} }
ctxt['ssl'] = False ctxt['ssl'] = False

2
revision
View File

@@ -1 +1 @@
125 126

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

@@ -45,6 +45,7 @@ auth_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ service_port }}
admin_tenant_name = {{ service_tenant }} admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_user }} admin_user = {{ service_user }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
delay_auth_decision = {{ delay_auth_decision }}
{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %} {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}

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

@@ -45,6 +45,7 @@ auth_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ service_port }}
admin_tenant_name = {{ service_tenant }} admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_user }} admin_user = {{ service_user }}
admin_password = {{ service_password }} admin_password = {{ service_password }}
delay_auth_decision = {{ delay_auth_decision }}
{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %} {% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}