diff options
author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-01-27 21:41:10 -0500 |
---|---|---|
committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-01-28 11:40:36 -0500 |
commit | 30c68f47e9afb323761c24cb2417e11a404f64ce (patch) | |
tree | 83f146cc0c346d857a1cfe23625f3478070ca214 | |
parent | 592d46aeb8b9e39f9a7c1c31fe16cab939fe37f9 (diff) | |
download | nova-30c68f47e9afb323761c24cb2417e11a404f64ce.tar.gz nova-30c68f47e9afb323761c24cb2417e11a404f64ce.tar.xz nova-30c68f47e9afb323761c24cb2417e11a404f64ce.zip |
Add Region name to quantum client
Looks like multi-region setups need the region name
Fixes LP# 1081037
DocImpact
Change-Id: Id8d5b1e1adef75a93df9a3527fd6da463fed0d09
-rw-r--r-- | nova/network/quantumv2/__init__.py | 1 | ||||
-rw-r--r-- | nova/network/quantumv2/api.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/nova/network/quantumv2/__init__.py b/nova/network/quantumv2/__init__.py index 914600ed8..13ce8b794 100644 --- a/nova/network/quantumv2/__init__.py +++ b/nova/network/quantumv2/__init__.py @@ -30,6 +30,7 @@ def _get_auth_token(): httpclient = client.HTTPClient( username=CONF.quantum_admin_username, tenant_name=CONF.quantum_admin_tenant_name, + region_name=CONF.quantum_region_name, password=CONF.quantum_admin_password, auth_url=CONF.quantum_admin_auth_url, timeout=CONF.quantum_url_timeout, diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 704ed5cef..b2c20e225 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -41,6 +41,8 @@ quantum_opts = [ help='password for connecting to quantum in admin context'), cfg.StrOpt('quantum_admin_tenant_name', 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', default='http://localhost:5000/v2.0', help='auth url for connecting to quantum in admin context'), |