neutron nova_admin_auth_url requires a protocol version

In my recent patch to move to identity_url, I mistakenly also
touched the nova_admin_auth_url which removed the v2.0 protocol
version from it.  This prevents neutron from working properly
with nova.

Change-Id: Ib48a9a4be4478eb5f6fd1a07c8bd13d57af1c4db
Closes-Bug: #1446652
This commit is contained in:
Mark Vanderwiel 2015-04-21 08:31:14 -05:00 committed by Ma Wen Cheng
parent abcf9b208b
commit adc1a82c52
3 changed files with 3 additions and 2 deletions

View File

@ -193,6 +193,7 @@ template '/etc/neutron/neutron.conf' do
core_plugin: core_plugin,
auth_uri: auth_uri,
identity_uri: identity_uri,
identity_admin_endpoint: identity_admin_endpoint,
service_pass: service_pass,
sql_connection: sql_connection,
nova_endpoint: nova_endpoint,

View File

@ -673,7 +673,7 @@ describe 'openstack-network' do
end
it 'sets the nova_admin_auth_url attribute' do
expect(chef_run).to render_file(file.name).with_content(%r(^nova_admin_auth_url = http://127.0.0.1:35357/$))
expect(chef_run).to render_file(file.name).with_content(%r(^nova_admin_auth_url = http://127.0.0.1:35357/v2.0$))
end
it 'has default nova_api_insecure' do

View File

@ -376,7 +376,7 @@ nova_admin_tenant_name = <%= node["openstack"]["network"]["nova"]["admin_tenant_
nova_admin_password = <%= @nova_admin_pass %>
# Authorization URL for connection to nova in admin context.
nova_admin_auth_url = <%= @identity_uri %>
nova_admin_auth_url = <%= @identity_admin_endpoint.to_s %>
# CA file for novaclient to verify server certificates
<% if node['openstack']['network']['nova']['nova_ca_certificates_file'] -%>