summaryrefslogtreecommitdiffstats
path: root/nova/console
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-03-09 11:05:13 +0000
committerMark McLoughlin <markmc@redhat.com>2012-03-09 11:23:33 +0000
commit5aef0e13411fb8ce4e396b9addf65ef5a9ba28a2 (patch)
tree1972d4f62b4b3986af0e024a3aea4c92c2163b0b /nova/console
parent17396f6a08b694b28538462baca582266152da86 (diff)
downloadnova-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/console')
-rw-r--r--nova/console/xvp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/console/xvp.py b/nova/console/xvp.py
index 14e9cc0e7..341af1c57 100644
--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@@ -33,7 +33,7 @@ from nova import utils
xvp_opts = [
cfg.StrOpt('console_xvp_conf_template',
- default=utils.abspath('console/xvp.conf.template'),
+ default='$pybasedir/nova/console/xvp.conf.template',
help='XVP conf template'),
cfg.StrOpt('console_xvp_conf',
default='/etc/xvp.conf',