summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Pilotti <ap@pilotti.it>2012-11-12 23:24:06 +0200
committerAlessandro Pilotti <ap@pilotti.it>2012-11-13 00:27:03 +0200
commit355a27e99b5bbe85efb2885b0f7bd2866473d58c (patch)
treed2ca9112a63aaa3c7ad443785adb66de92701a6f
parent9892d001303512160387e3d451064bc7efc7a32a (diff)
downloadnova-355a27e99b5bbe85efb2885b0f7bd2866473d58c.tar.gz
nova-355a27e99b5bbe85efb2885b0f7bd2866473d58c.tar.xz
nova-355a27e99b5bbe85efb2885b0f7bd2866473d58c.zip
Adds a conf option for custom configdrive mkisofs
In order to support ConfigDrive on Hyper-V an option for supporting a customizable mkisofs / genisoimage is needed, including optional path. The option "mkisofs_cmd" deafult to "genisoimage" to preserve backwards compatibility Change-Id: I89167bf77bddae9a0f989874ad0a972d7898a903
-rw-r--r--nova/virt/configdrive.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py
index 0dc11483d..8d7046e18 100644
--- a/nova/virt/configdrive.py
+++ b/nova/virt/configdrive.py
@@ -46,6 +46,10 @@ configdrive_opts = [
default=None,
help='Set to force injection to take place on a config drive '
'(if set, valid options are: always)'),
+ cfg.StrOpt('mkisofs_cmd',
+ default='genisoimage',
+ help='Name and optionally path of the tool used for '
+ 'ISO image creation')
]
CONF = config.CONF
@@ -79,7 +83,7 @@ class ConfigDriveBuilder(object):
{'filepath': path})
def _make_iso9660(self, path):
- utils.execute('genisoimage',
+ utils.execute(CONF.mkisofs_cmd,
'-o', path,
'-ldots',
'-allow-lowercase',