openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Enable SSL termination for all services"

Browse Source
This commit is contained in:
Jenkins 2016-03-04 17:54:28 +00:00 committed by Gerrit Code Review
commit afcf86c50f
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/swift_service_setup.yml
View File

@ -113,6 +113,7 @@
token: "{{ keystone_auth_admin_token }}" token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}" endpoint: "{{ keystone_service_adminurl }}"
role_name: "ResellerAdmin" role_name: "ResellerAdmin"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_role register: add_role
until: add_role|success until: add_role|success
retries: 5 retries: 5
@ -130,6 +131,7 @@
user_name: "{{ ceilometer_service_user_name }}" user_name: "{{ ceilometer_service_user_name }}"
tenant_name: "{{ ceilometer_service_tenant_name }}" tenant_name: "{{ ceilometer_service_tenant_name }}"
role_name: "{{ swift_reselleradmin_role }}" role_name: "{{ swift_reselleradmin_role }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: ensure_role register: ensure_role
until: ensure_role|success until: ensure_role|success
retries: 5 retries: 5

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

@ -81,6 +81,7 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
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 }}
insecure = {{ keystone_service_adminuri_insecure | bool }}
project_domain_id = {{ swift_service_project_domain_id }} project_domain_id = {{ swift_service_project_domain_id }}
user_domain_id = {{ swift_service_user_domain_id }} user_domain_id = {{ swift_service_user_domain_id }}
project_name = {{ swift_service_project_name }} project_name = {{ swift_service_project_name }}

1
templates/swift-dispersion.conf.j2
View File

@ -5,4 +5,5 @@ auth_url = {{ keystone_service_internalurl }}
auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }} auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }}
auth_key = {{ swift_dispersion_password }} auth_key = {{ swift_dispersion_password }}
auth_version = 2.0 auth_version = 2.0
keystone_api_insecure = {{ keystone_service_internaluri_insecure | bool }}
endpoint_type = internalURL endpoint_type = internalURL