diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-30 00:15:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-30 00:15:08 +0000 |
| commit | f211597f02c62d67adb8a87f85a934c012926e18 (patch) | |
| tree | 14edbf60650bb8ddb190158a11b011a2084e6885 | |
| parent | f11097890ef6df9348760687fb4703dd58ab13b0 (diff) | |
| parent | 30c68f47e9afb323761c24cb2417e11a404f64ce (diff) | |
| download | nova-f211597f02c62d67adb8a87f85a934c012926e18.tar.gz nova-f211597f02c62d67adb8a87f85a934c012926e18.tar.xz nova-f211597f02c62d67adb8a87f85a934c012926e18.zip | |
Merge "Add Region name to quantum client"
| -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'), |