relocate create.name to conf module
authorGui Chen <gui.chen@intel.com>
Wed, 14 May 2014 05:57:26 +0000 (01:57 -0400)
committerGui Chen <gui.chen@intel.com>
Mon, 9 Jun 2014 05:37:41 +0000 (01:37 -0400)
Change-Id: Id3e8d2cbf0a4e08ecfbe7941c4967206cd40cd88
Signed-off-by: Gui Chen <gui.chen@intel.com>
mic/conf.py
mic/imager/baseimager.py

index f99bb39..24e5d4e 100644 (file)
@@ -201,6 +201,9 @@ class ConfigMgr(object):
                                               self.create['name_prefix'],
                                               self.create['name_suffix'])
 
+        if self.create['release'] is not None:
+            self.create['name'] = self.create['release'] + '_' + self.create['name']
+
         msger.info("Retrieving repo metadata:")
         ksrepos = kickstart.get_repos(ks,
                                       self.create['extrarepos'],
index 2e00384..59086f5 100644 (file)
@@ -105,9 +105,6 @@ class BaseImageCreator(object):
 
             self.destdir = os.path.abspath(os.path.expanduser(self.destdir))
 
-            if 'release' in createopts and createopts['release']:
-                self.name = createopts['release'] + '_' + self.name
-
             if self.pack_to:
                 if '@NAME@' in self.pack_to:
                     self.pack_to = self.pack_to.replace('@NAME@', self.name)