diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-15 07:32:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-15 07:32:09 +0000 |
| commit | b1d7ea95a61d677186551135cae7fbefb83a2c13 (patch) | |
| tree | 22b5fbca3062c740e2baab6a2a2058fad56bdb9e | |
| parent | 78b203a81e3c08f23ae10c741ebc9436a97c5118 (diff) | |
| parent | 355a27e99b5bbe85efb2885b0f7bd2866473d58c (diff) | |
| download | nova-b1d7ea95a61d677186551135cae7fbefb83a2c13.tar.gz nova-b1d7ea95a61d677186551135cae7fbefb83a2c13.tar.xz nova-b1d7ea95a61d677186551135cae7fbefb83a2c13.zip | |
Merge "Adds a conf option for custom configdrive mkisofs"
| -rw-r--r-- | nova/virt/configdrive.py | 6 |
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', |