openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Enable all services to use Keystone 'insecurely'"

Browse Source
This commit is contained in:
Jenkins 2015-07-10 16:53:24 +00:00 committed by Gerrit Code Review
commit 7d9120327c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/swift_service_setup.yml
View File

@ -22,6 +22,7 @@
service_name: "{{ swift_service_name }}" service_name: "{{ swift_service_name }}"
service_type: "{{ swift_service_type }}" service_type: "{{ swift_service_type }}"
description: "{{ swift_service_description }}" description: "{{ swift_service_description }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -40,6 +41,7 @@
user_name: "{{ swift_service_user_name }}" user_name: "{{ swift_service_user_name }}"
tenant_name: "{{ swift_service_project_name }}" tenant_name: "{{ swift_service_project_name }}"
password: "{{ swift_service_password }}" password: "{{ swift_service_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -58,6 +60,7 @@
user_name: "{{ swift_service_user_name }}" user_name: "{{ swift_service_user_name }}"
tenant_name: "{{ swift_service_project_name }}" tenant_name: "{{ swift_service_project_name }}"
role_name: "{{ swift_service_role_name }}" role_name: "{{ swift_service_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -73,6 +76,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
role_name: "{{ swift_operator_role }}" role_name: "{{ swift_operator_role }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -90,6 +94,7 @@
user_name: "{{ swift_dispersion_user }}" user_name: "{{ swift_dispersion_user }}"
tenant_name: "{{ swift_service_project_name }}" tenant_name: "{{ swift_service_project_name }}"
password: "{{ swift_dispersion_password }}" password: "{{ swift_dispersion_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -139,6 +144,7 @@
user_name: "{{ swift_dispersion_user }}" user_name: "{{ swift_dispersion_user }}"
tenant_name: "{{ swift_service_project_name }}" tenant_name: "{{ swift_service_project_name }}"
role_name: "{{ swift_operator_role }}" role_name: "{{ swift_operator_role }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5
@ -160,6 +166,7 @@
publicurl: "{{ swift_service_publicurl }}" publicurl: "{{ swift_service_publicurl }}"
adminurl: "{{ swift_service_internalurl }}" adminurl: "{{ swift_service_internalurl }}"
internalurl: "{{ swift_service_adminurl }}" internalurl: "{{ swift_service_adminurl }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service|success until: add_service|success
retries: 5 retries: 5

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

@ -54,6 +54,7 @@ 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
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ swift_keystone_auth_plugin }} auth_plugin = {{ swift_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internaluri }}