From 355a27e99b5bbe85efb2885b0f7bd2866473d58c Mon Sep 17 00:00:00 2001
From: Alessandro Pilotti <ap@pilotti.it>
Date: Mon, 12 Nov 2012 23:24:06 +0200
Subject: 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
---
 nova/virt/configdrive.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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',
-- 
cgit