From 5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 9 Mar 2012 11:05:13 +0000
Subject: Add pybasedir and bindir options

Add a pybasedir option so that it can be used for interpolation in the
default values of other options. This helps eliminate hard-coded paths
from the sample config file.

Also add a bindir option for similar reasons, but it also helps with
packaging.

Change-Id: Iadc746dcf2a24adbdf9bac945b5b330f01faeeb5
---
 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 dccfc8071..497ee6ffc 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -45,7 +45,7 @@ cloudpipe_opts = [
                default='m1.tiny',
                help=_('Instance type for vpn instances')),
     cfg.StrOpt('boot_script_template',
-               default=utils.abspath('cloudpipe/bootscript.template'),
+               default='$pybasedir/nova/cloudpipe/bootscript.template',
                help=_('Template for cloudpipe instance boot script')),
     cfg.StrOpt('dmz_net',
                default='10.0.0.0',
-- 
cgit