From 084ff0495dc014b9cc2215551a9b1575eeb1dda5 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 13 Dec 2012 18:58:35 +0000
Subject: 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>
---
 nova/virt/configdrive.py | 9 +++++++--
 1 file 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',
-- 
cgit