From 2553b4a22175d9a00a36fd9d20f3c646fd3fab1f Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 4 Jan 2013 17:32:36 +0000 Subject: Move global path opts in nova.paths Move the global path config options (i.e. state_path, pybasedir and bindir) into a new nova.paths module. A new module may seem like overkill but some utility methods associated with these options follow in a later commit. Moving them to nova.paths means they are no longer globally defined and it's more obvious which modules require these options. Change-Id: I381d23f1bbe36dc6967a38a65062b0983e1661aa --- nova/cloudpipe/pipelib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/cloudpipe') diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 8b8ae00c6..05b2aee2e 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -58,7 +58,7 @@ CONF.import_opt('ec2_dmz_host', 'nova.api.ec2.cloud') CONF.import_opt('ec2_port', 'nova.api.ec2.cloud') CONF.import_opt('vpn_image_id', 'nova.config') CONF.import_opt('vpn_key_suffix', 'nova.config') -CONF.import_opt('pybasedir', 'nova.config') +CONF.import_opt('pybasedir', 'nova.paths') CONF.import_opt('cnt_vpn_clients', 'nova.network.manager') LOG = logging.getLogger(__name__) -- cgit