diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml index 7024ed67..34e91357 100644 --- a/tasks/swift_service_setup.yml +++ b/tasks/swift_service_setup.yml @@ -113,6 +113,7 @@ token: "{{ keystone_auth_admin_token }}" endpoint: "{{ keystone_service_adminurl }}" role_name: "ResellerAdmin" + insecure: "{{ keystone_service_adminuri_insecure }}" register: add_role until: add_role|success retries: 5 @@ -130,6 +131,7 @@ user_name: "{{ ceilometer_service_user_name }}" tenant_name: "{{ ceilometer_service_tenant_name }}" role_name: "{{ swift_reselleradmin_role }}" + insecure: "{{ keystone_service_adminuri_insecure }}" register: ensure_role until: ensure_role|success retries: 5 diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2 index b1d0d197..5fbcb730 100644 --- a/templates/proxy-server.conf.j2 +++ b/templates/proxy-server.conf.j2 @@ -81,6 +81,7 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory auth_plugin = {{ swift_keystone_auth_plugin }} auth_url = {{ keystone_service_adminuri }} auth_uri = {{ keystone_service_internaluri }} +insecure = {{ keystone_service_adminuri_insecure | bool }} project_domain_id = {{ swift_service_project_domain_id }} user_domain_id = {{ swift_service_user_domain_id }} project_name = {{ swift_service_project_name }} diff --git a/templates/swift-dispersion.conf.j2 b/templates/swift-dispersion.conf.j2 index 86ac4954..2469d894 100644 --- a/templates/swift-dispersion.conf.j2 +++ b/templates/swift-dispersion.conf.j2 @@ -5,4 +5,5 @@ auth_url = {{ keystone_service_internalurl }} auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }} auth_key = {{ swift_dispersion_password }} auth_version = 2.0 +keystone_api_insecure = {{ keystone_service_internaluri_insecure | bool }} endpoint_type = internalURL