diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-20 13:58:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-20 13:58:19 +0000 |
| commit | ae4fb9974df79e4eb3f20638a3071b409fc70a9e (patch) | |
| tree | 4e79ea4d22d33e3c7b523df56d24ca82f2bc53c9 | |
| parent | 747b6275ae168895efc65c1cd74835f62ea56c8b (diff) | |
| parent | 084ff0495dc014b9cc2215551a9b1575eeb1dda5 (diff) | |
| download | nova-ae4fb9974df79e4eb3f20638a3071b409fc70a9e.tar.gz nova-ae4fb9974df79e4eb3f20638a3071b409fc70a9e.tar.xz nova-ae4fb9974df79e4eb3f20638a3071b409fc70a9e.zip | |
Merge "Make configdrive.py use version.product_string()"
| -rw-r--r-- | nova/virt/configdrive.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index f5f881532..2a1001577 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -81,14 +81,19 @@ class ConfigDriveBuilder(object): {'filepath': path}) def _make_iso9660(self, path): + publisher = "%(product)s %(version)s" % { + 'product': version.product_string(), + 'version': version.version_string_with_package() + } + utils.execute(CONF.mkisofs_cmd, '-o', path, '-ldots', '-allow-lowercase', '-allow-multidot', '-l', - '-publisher', ('"OpenStack nova %s"' - % version.version_string()), + '-publisher', + publisher, '-quiet', '-J', '-r', |