From 30c68f47e9afb323761c24cb2417e11a404f64ce Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 27 Jan 2013 21:41:10 -0500 Subject: [PATCH] Add Region name to quantum client Looks like multi-region setups need the region name Fixes LP# 1081037 DocImpact Change-Id: Id8d5b1e1adef75a93df9a3527fd6da463fed0d09 --- nova/network/quantumv2/__init__.py | 1 + nova/network/quantumv2/api.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nova/network/quantumv2/__init__.py b/nova/network/quantumv2/__init__.py index 914600ed8e6b..13ce8b7949f2 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 704ed5cef8ad..b2c20e225aa0 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'),