openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Nachi Ueno 2012-11-09 13:36:44 -08:00
parent 2cf66d2585
commit 12674de396
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-common.conf
View File

@ -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

4
quantum/debug/README
View File

@ -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

4
quantum/debug/shell.py
View File

@ -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)