openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fix auth_url for neutron configuration

Browse Source 
This fix configures the auth_url parameter to use keystone_service_adminurl
over the existing keystone_service_adminuri parameter which actually leads
to a incomplete URL lacking the API version like /v3/tokens

Change-Id: Ic8b353b6d41b48cb9d7d825d26dc932d940994e8
Closes-Bug: #1552394
This commit is contained in:
Bjoern Teipel 2016-03-02 13:54:19 -06:00
parent 4e0b39851e
commit eda93fea23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/metadata_agent.ini.j2
View File

@ -10,7 +10,7 @@ debug = {{ debug }}
# Neutron credentials for API access # Neutron credentials for API access
auth_plugin = {{ neutron_keystone_auth_plugin }} auth_plugin = {{ neutron_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internaluri }}
auth_region = {{ keystone_service_region }} auth_region = {{ keystone_service_region }}
project_domain_id = {{ neutron_service_project_domain_id }} project_domain_id = {{ neutron_service_project_domain_id }}

2
templates/neutron.conf.j2
View File

@ -95,7 +95,7 @@ rpc_response_timeout = {{ neutron_rpc_response_timeout }}
[nova] [nova]
auth_plugin = {{ nova_keystone_auth_plugin }} auth_plugin = {{ nova_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminurl }}
region_name = {{ nova_service_region }} region_name = {{ nova_service_region }}
project_domain_id = {{ nova_service_project_domain_id }} project_domain_id = {{ nova_service_project_domain_id }}
user_domain_id = {{ nova_service_user_domain_id }} user_domain_id = {{ nova_service_user_domain_id }}

2
templates/plugins/plumgrid/pgrc
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# {{ ansible_managed }} # {{ ansible_managed }}
export os_auth_url="{{ keystone_service_adminuri }}/v3" export os_auth_url="{{ keystone_service_adminurl }}"
export os_admin_user="{{ keystone_admin_user_name }}" export os_admin_user="{{ keystone_admin_user_name }}"
export os_admin_tenant="{{ keystone_admin_tenant_name }}" export os_admin_tenant="{{ keystone_admin_tenant_name }}"
export os_admin_password="{{ keystone_auth_admin_password }}" export os_admin_password="{{ keystone_auth_admin_password }}"