From 2c0637fffc553d51c856adb13beefbb50d211a6b Mon Sep 17 00:00:00 2001 From: Nachi Ueno Date: Fri, 9 Nov 2012 13:36:44 -0800 Subject: [PATCH] Add QUANTUM_ prefix for env used by quantum-debug Fixes bug 1077204 from TEST_CONFIG_FILE to QUANTUM_TEST_CONFIG_FILE also fixes openstack-common style Change-Id: I03d386dd5fc28d91ef496aecb1b93ddb4f4a810d --- openstack-common.conf | 2 +- quantum/debug/README | 4 ++-- quantum/debug/shell.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openstack-common.conf b/openstack-common.conf index 00524ca4b4..7bb3a36562 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,5 +1,5 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,lockutils,importutils,iniparser,jsonutils,local,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils,version +modules=cfg,context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,iniparser,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils,version # The base module to hold the copy of openstack.common base=quantum diff --git a/quantum/debug/README b/quantum/debug/README index 9ef1def447..00d05fd157 100644 --- a/quantum/debug/README +++ b/quantum/debug/README @@ -1,9 +1,9 @@ Debug Helper Script for Quantum - Configure -export TEST_CONFIG_FILE=/etc/quantum/debug.ini +export QUANTUM_TEST_CONFIG_FILE=/etc/quantum/debug.ini or -export TEST_CONFIG_FILE=/etc/quantum/l3_agent.ini +export QUANTUM_TEST_CONFIG_FILE=/etc/quantum/l3_agent.ini you can also specify config file by --config-file option diff --git a/quantum/debug/shell.py b/quantum/debug/shell.py index 65c9dc85f6..e9ecf7fa18 100644 --- a/quantum/debug/shell.py +++ b/quantum/debug/shell.py @@ -57,7 +57,7 @@ class QuantumDebugShell(QuantumShell): description, version) parser.add_argument( '--config-file', - default=env('TEST_CONFIG_FILE'), + default=env('QUANTUM_TEST_CONFIG_FILE'), help='Config file for interface driver ' '(You may also use l3_agent.ini)') return parser @@ -67,7 +67,7 @@ class QuantumDebugShell(QuantumShell): if not self.options.config_file: raise exc.CommandError( "You must provide a config file for bridge -" - " either --config-file or env[TEST_CONFIG_FILE]") + " either --config-file or env[QUANTUM_TEST_CONFIG_FILE]") client = self.client_manager.quantum cfg.CONF.register_opts(interface.OPTS) cfg.CONF.register_opts(QuantumDebugAgent.OPTS)