diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-03-09 11:05:13 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-03-09 11:23:33 +0000 |
| commit | 5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2 (patch) | |
| tree | 1972d4f62b4b3986af0e024a3aea4c92c2163b0b /nova/cloudpipe | |
| parent | 17396f6a08b694b28538462baca582266152da86 (diff) | |
| download | nova-5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2.tar.gz nova-5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2.tar.xz nova-5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2.zip | |
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
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 2 |
1 files changed, 1 insertions, 1 deletions
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', |