diff options
| author | Hadi Bannazadeh <hadi@savinetwork.ca> | 2015-01-21 00:06:48 +0000 |
|---|---|---|
| committer | Hadi Bannazadeh <hadi@savinetwork.ca> | 2015-01-30 23:53:54 +0000 |
| commit | f47b0e2aea14178f24de03f68f775f9f1f556bce (patch) | |
| tree | 0757aa99bb4e770669c172e833cb1a2e7d915c5e /ironic/dhcp | |
| parent | ecf0995d2bc280b018ad49fbd0698b4892b78df3 (diff) | |
| download | ironic-f47b0e2aea14178f24de03f68f775f9f1f556bce.tar.gz | |
region missing in endpoint selection
Region parameter is missing in selecting other components
endpoint. This causes problem if there are multiple service
endpoints available in keystone service catalog for different
regions.
Closes-Bug: #1412238
Change-Id: I64697863ef7e3d57d84d9681cc4c54a9a2a06478
Diffstat (limited to 'ironic/dhcp')
| -rw-r--r-- | ironic/dhcp/neutron.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 9c78966ce..e0b443c1e 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -81,6 +81,8 @@ def _build_client(token=None): params['tenant_name'] = CONF.keystone_authtoken.admin_tenant_name params['password'] = CONF.keystone_authtoken.admin_password params['auth_url'] = (CONF.keystone_authtoken.auth_uri or '') + if CONF.keystone.region_name: + params['region_name'] = CONF.keystone.region_name else: params['token'] = token params['endpoint_url'] = CONF.neutron.url |