summaryrefslogtreecommitdiffstats
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-01-04 17:32:36 +0000
committerMark McLoughlin <markmc@redhat.com>2013-01-04 17:32:36 +0000
commit2553b4a22175d9a00a36fd9d20f3c646fd3fab1f (patch)
tree6e5893a9e9ee7cf4d3a4800eed6d25b62aa70340 /nova/cloudpipe
parent904814e51f4f24a704d98c3d13a8cce2a5bddc7e (diff)
downloadnova-2553b4a22175d9a00a36fd9d20f3c646fd3fab1f.tar.gz
nova-2553b4a22175d9a00a36fd9d20f3c646fd3fab1f.tar.xz
nova-2553b4a22175d9a00a36fd9d20f3c646fd3fab1f.zip
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
Diffstat (limited to 'nova/cloudpipe')
-rw-r--r--nova/cloudpipe/pipelib.py2
1 files changed, 1 insertions, 1 deletions
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__)