Add Region name to quantum client

Looks like multi-region setups need the region name Fixes LP# 1081037 DocImpact Change-Id: Id8d5b1e1adef75a93df9a3527fd6da463fed0d09
openstack · Jan 28, 2013 · 30c68f4 · 30c68f4
1 parent 592d46a
commit 30c68f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -41,6 +41,8 @@
                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'),