openstack/nova
Code Issues Proposed changes

Add Region name to quantum client

Browse Source 
Looks like multi-region setups need the region name

Fixes LP# 1081037

DocImpact

Change-Id: Id8d5b1e1adef75a93df9a3527fd6da463fed0d09
This commit is contained in:
Davanum Srinivas
2013-01-27 21:41:10 -05:00
parent 592d46aeb8
commit 30c68f47e9
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/network/quantumv2/__init__.py
View File

@@ -30,6 +30,7 @@ def _get_auth_token():
httpclient = client.HTTPClient( httpclient = client.HTTPClient(
username=CONF.quantum_admin_username, username=CONF.quantum_admin_username,
tenant_name=CONF.quantum_admin_tenant_name, tenant_name=CONF.quantum_admin_tenant_name,
region_name=CONF.quantum_region_name,
password=CONF.quantum_admin_password, password=CONF.quantum_admin_password,
auth_url=CONF.quantum_admin_auth_url, auth_url=CONF.quantum_admin_auth_url,
timeout=CONF.quantum_url_timeout, timeout=CONF.quantum_url_timeout,

2
nova/network/quantumv2/api.py
View File

@@ -41,6 +41,8 @@ quantum_opts = [
help='password for connecting to quantum in admin context'), help='password for connecting to quantum in admin context'),
cfg.StrOpt('quantum_admin_tenant_name', cfg.StrOpt('quantum_admin_tenant_name',
help='tenant name for connecting to quantum in admin context'), help='tenant name for connecting to quantum in admin context'),
cfg.StrOpt('quantum_region_name',
help='region name for connecting to quantum in admin context'),
cfg.StrOpt('quantum_admin_auth_url', cfg.StrOpt('quantum_admin_auth_url',
default='http://localhost:5000/v2.0', default='http://localhost:5000/v2.0',
help='auth url for connecting to quantum in admin context'), help='auth url for connecting to quantum in admin context'),