Fix nova auth_url setting
Change Id350abd82df48c1e00e4b2bb8bc944658ddd85e6 replaced auth_plugin with auth_type but missed one occurance in the default receipe. Change-Id: I395b48616ea57167558df7c6a0dda30c01d724b1
This commit is contained in:
parent
8a87bcaa20
commit
b68271e144
|
@ -96,9 +96,9 @@ db_pass = get_password 'db', 'neutron'
|
|||
bind_service = node['openstack']['bind_service']['all']['network']
|
||||
bind_service_address = bind_address bind_service
|
||||
|
||||
# The auth_url in nova section follows auth_plugin
|
||||
# The auth_url in nova section follows auth_type
|
||||
nova_auth_url = nil
|
||||
case node['openstack']['network']['conf']['nova']['auth_plugin']
|
||||
case node['openstack']['network']['conf']['nova']['auth_type']
|
||||
when 'password'
|
||||
nova_auth_url = auth_uri
|
||||
when 'v2password'
|
||||
|
@ -113,7 +113,7 @@ node.default['openstack']['network']['conf'].tap do |conf|
|
|||
end
|
||||
conf['DEFAULT']['bind_host'] = bind_service_address
|
||||
conf['DEFAULT']['bind_port'] = bind_service.port
|
||||
conf['nova']['auth_url'] = nova_auth_url
|
||||
conf['nova']['auth_url'] = nova_auth_url if nova_auth_url
|
||||
conf['keystone_authtoken']['auth_url'] = auth_url
|
||||
end
|
||||
|
||||
|
|
|
@ -128,6 +128,7 @@ describe 'openstack-network' do
|
|||
[
|
||||
/^region_name = RegionOne$/,
|
||||
/^auth_type = v2password$/,
|
||||
%r{^auth_url = http://127\.0\.0\.1:5000/v2\.0$},
|
||||
/^username = nova$/,
|
||||
/^tenant_name = service$/
|
||||
].each do |line|
|
||||
|
|
Loading…
Reference in New Issue