diff options
| author | John L. Villalovos <john.l.villalovos@intel.com> | 2015-12-11 06:02:14 -0800 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2015-12-11 06:03:16 -0800 |
| commit | f4a7a847b7c3cd1aa43ec600c6d4cd51ed796145 (patch) | |
| tree | 18491e284579ccb4534af7675ca765a962c66480 /ironic/dhcp/neutron.py | |
| parent | d5fbb1c38dce5f4dcd1dddb9f67b67902a4f3748 (diff) | |
| download | ironic-f4a7a847b7c3cd1aa43ec600c6d4cd51ed796145.tar.gz | |
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
Diffstat (limited to 'ironic/dhcp/neutron.py')
| -rw-r--r-- | ironic/dhcp/neutron.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 8548c1b4c..dee9b6955 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -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 |