Adding RHSM user and password to Cobbler system definition

diff --git a/lib/cr_vmware_tpl/cobbler/system.py b/lib/cr_vmware_tpl/cobbler/system.py
index 22291284cf5182e1b6daee235f7961dccb3c08c1..35292a988528a1100d383d5536475ca3f49c2b00 100644 (file)
--- a/lib/cr_vmware_tpl/cobbler/system.py
+++ b/lib/cr_vmware_tpl/cobbler/system.py
@@ -19,7 +19,7 @@ from .. import print_section_start, print_section_end
 from ..errors import ExpectedCobblerError
 from ..xlate import XLATOR
 
-__version__ = '0.1.1'
+__version__ = '0.2.0'
 
 LOG = logging.getLogger(__name__)
 
@@ -76,13 +76,18 @@ class CobblerSystem():
         ks_meta_list.append("SYSTEM_STATUS={}".format(status))
         ks_meta_list.append("WS_REL_FILESDIR={}".format(self.cfg.cobbler_ws_rel_filesdir))
         ks_meta_list.append("COBBLER_URL=http://{}".format(self.cfg.cobbler_host))
-        if rhsm_user is not None:
-            ks_meta_list.append("RHSM_USER={}
+        if self.cfg.rhsm_user:
+            ks_meta_list.append("RHSM_USER={}".format(self.cfg.rhsm_user))
+        if self.cfg.rhsm_pwd:
+            ks_meta_list.append("RHSM_PWD={}".format(self.cfg.rhsm_pwd))
 
         ks_meta = None
         if ks_meta_list:
             ks_meta = ' '.join(ks_meta_list)
 
+        if self.verbose > 1:
+            LOG.debug(_("Kickstart meta variables: {}").format(ks_meta))
+
         args = ['system', 'add']
         args.append('--name')
         args.append(name)