Make configdrive.py use version.product_string()

Instead of hardcoding 'OpenStack nova' for the publisher
when building ISO images, use version.product_string().
Also append the package version suffix, if any.

Change-Id: If3dfbf895ef7037e15dd3ff8da8f47daecb4d24a
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2012-12-13 18:58:35 +00:00
parent 4aa45d2900
commit 084ff0495d

View File

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