openstack/openstack-ansible
Code Issues Proposed changes

Update keystone middleware in swift for Kilo

Browse Source 
Update keystone authentication middleware in swift to
support the v3 API in Kilo.

Partially implements: blueprint master-kilofication

Change-Id: I28420dbb1cc0da958791c5e23c13eb38689028dd
This commit is contained in:
Matthew Kassawara 2015-04-15 11:11:46 -05:00 committed by Jesse Pretorius
parent 2e3874c3ad
commit b9161d77db
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/os_swift/defaults/main.yml
View File

@ -40,7 +40,9 @@ swift_account_port: "6002"
## Swift service defaults ## Swift service defaults
swift_service_name: swift swift_service_name: swift
swift_service_user_name: swift swift_service_user_name: swift
swift_service_tenant_name: service swift_service_project_name: service
swift_service_project_domain_id: "default"
swift_service_user_domain_id: "default"
swift_service_role_name: "admin" swift_service_role_name: "admin"
swift_service_type: object-store swift_service_type: object-store
swift_service_proto: http swift_service_proto: http
@ -53,6 +55,9 @@ swift_service_internaluri: "{{ swift_service_proto }}://{{ internal_lb_vip_addre
swift_service_internalurl: "{{ swift_service_internaluri }}/v1/AUTH_%(tenant_id)s" swift_service_internalurl: "{{ swift_service_internaluri }}/v1/AUTH_%(tenant_id)s"
swift_service_region: RegionOne swift_service_region: RegionOne
## Keystone authentication middleware
swift_keystone_auth_plugin: "password"
## Swift default variables ## Swift default variables
swift_dispersion_user: dispersion swift_dispersion_user: dispersion
swift_operator_role: swiftoperator swift_operator_role: swiftoperator

8
playbooks/roles/os_swift/tasks/swift_service_setup.yml
View File

@ -38,7 +38,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
user_name: "{{ swift_service_user_name }}" user_name: "{{ swift_service_user_name }}"
tenant_name: "{{ swift_service_tenant_name }}" tenant_name: "{{ swift_service_project_name }}"
password: "{{ swift_service_password }}" password: "{{ swift_service_password }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
@ -56,7 +56,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
user_name: "{{ swift_service_user_name }}" user_name: "{{ swift_service_user_name }}"
tenant_name: "{{ swift_service_tenant_name }}" tenant_name: "{{ swift_service_project_name }}"
role_name: "{{ swift_service_role_name }}" role_name: "{{ swift_service_role_name }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
@ -88,7 +88,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
user_name: "{{ swift_dispersion_user }}" user_name: "{{ swift_dispersion_user }}"
tenant_name: "{{ swift_service_tenant_name }}" tenant_name: "{{ swift_service_project_name }}"
password: "{{ swift_dispersion_password }}" password: "{{ swift_dispersion_password }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
@ -105,7 +105,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
user_name: "{{ swift_dispersion_user }}" user_name: "{{ swift_dispersion_user }}"
tenant_name: "{{ swift_service_tenant_name }}" tenant_name: "{{ swift_service_project_name }}"
role_name: "{{ swift_operator_role }}" role_name: "{{ swift_operator_role }}"
register: add_service register: add_service
until: add_service|success until: add_service|success

13
playbooks/roles/os_swift/templates/proxy-server.conf.j2
View File

@ -35,11 +35,14 @@ user_test_tester3 = testing3
{% elif swift_authtoken_active %} {% elif swift_authtoken_active %}
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
identity_uri = {{ keystone_service_adminuri }} auth_plugin = {{ swift_keystone_auth_plugin }}
auth_uri = {{ keystone_service_internalurl }} auth_url = {{ keystone_service_adminuri }}
admin_tenant_name = {{ swift_service_tenant_name }} auth_uri = {{ keystone_service_internaluri }}
admin_user = {{ swift_service_user_name }} project_domain_id = {{ swift_service_project_domain_id }}
admin_password = {{ swift_service_password }} user_domain_id = {{ swift_service_user_domain_id }}
project_name = {{ swift_service_project_name }}
username = {{ swift_service_user_name }}
password = {{ swift_service_password }}
delay_auth_decision = {{ swift_delay_auth_decision }} delay_auth_decision = {{ swift_delay_auth_decision }}
{% endif %} {% endif %}