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/virt | |
| parent | 17396f6a08b694b28538462baca582266152da86 (diff) | |
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/virt')
| -rw-r--r-- | nova/virt/baremetal/proxy.py | 2 | ||||
| -rw-r--r-- | nova/virt/disk/api.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nova/virt/baremetal/proxy.py b/nova/virt/baremetal/proxy.py index 788386edd..50c72dd87 100644 --- a/nova/virt/baremetal/proxy.py +++ b/nova/virt/baremetal/proxy.py @@ -60,7 +60,7 @@ FLAGS = flags.FLAGS baremetal_opts = [ cfg.StrOpt('baremetal_injected_network_template', - default=utils.abspath('virt/interfaces.template'), + default='$pybasedir/nova/virt/interfaces.template', help='Template file for injected network'), cfg.StrOpt('baremetal_type', default='baremetal', diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index a9b1067c2..f8b51fb31 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -45,7 +45,7 @@ LOG = logging.getLogger(__name__) disk_opts = [ cfg.StrOpt('injected_network_template', - default=utils.abspath('virt/interfaces.template'), + default='$pybasedir/nova/virt/interfaces.template', help='Template file for injected network'), cfg.ListOpt('img_handlers', default=['loop', 'nbd', 'guestfs'], diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index ae2a2b665..f526f15ca 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -87,7 +87,7 @@ libvirt_opts = [ default=None, help='Rescue ari image'), cfg.StrOpt('libvirt_xml_template', - default=utils.abspath('virt/libvirt.xml.template'), + default='$pybasedir/nova/virt/libvirt.xml.template', help='Libvirt XML Template'), cfg.StrOpt('libvirt_type', default='kvm', @@ -105,7 +105,7 @@ libvirt_opts = [ default=True, help='Sync virtual and real mouse cursors in Windows VMs'), cfg.StrOpt('cpuinfo_xml_template', - default=utils.abspath('virt/cpuinfo.xml.template'), + default='$pybasedir/nova/virt/cpuinfo.xml.template', help='CpuInfo XML Template (Used only live migration now)'), cfg.StrOpt('live_migration_uri', default="qemu+tcp://%s/system", |