openstack
/
ironic
Code Issues Proposed changes

Use 'service_type' of 'network'. Not 'neutron' 

'neutron' is not a 'service_type' in keystone. 'network' is the correct
'service_type' to use.

Closes-Bug: #1525222
Change-Id: I47a41fcb1e6b5ee7c8fb7fd4f895e60d43f36286
This commit is contained in:
John L. Villalovos 2015-12-11 06:02:14 -08:00
parent d5fbb1c38d
commit f4a7a847b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/dhcp/neutron.py
View File

@ -78,8 +78,9 @@ def _build_client(token=None):
params['endpoint_url'] = CONF.neutron.url
params['auth_strategy'] = 'noauth'
else:
params['endpoint_url'] = (CONF.neutron.url or
keystone.get_service_url('neutron'))
params['endpoint_url'] = (
CONF.neutron.url or
keystone.get_service_url(service_type='network'))
params['username'] = CONF.keystone_authtoken.admin_user
params['tenant_name'] = CONF.keystone_authtoken.admin_tenant_name
params['password'] = CONF.keystone_authtoken.admin_password