Merge branch 'devel' of ssh://git.fedorahosted.org/git/cobbler into devel

Conflicts:
	CHANGELOG

2 files changed, 8 insertions, 4 deletions

diff --git a/cobbler/item.py b/cobbler/item.py
index fbb1d9d5..31697a2f 100644
--- a/cobbler/item.py
+++ b/cobbler/item.py
@@ -196,7 +196,8 @@ class Item(serializable.Serializable):
         Assigns a list of configuration management classes that can be assigned
         to any object, such as those used by Puppet's external_nodes feature.
         """
-        self.mgmt_classes = utils.input_string_or_list(mgmt_classes)
+        mgmt_classes_split = utils.input_string_or_list(mgmt_classes, delim=" ")
+        self.mgmt_classes = utils.input_string_or_list(mgmt_classes_split)
         return True
 
     def set_template_files(self,template_files,inplace=False):
diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index 72f3659a..16cbffd1 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -197,7 +197,7 @@ class CobblerWeb(object):
 
     def distro_save(self,name=None,comment=None,oldname=None,new_or_edit=None,editmode='edit',kernel=None,
                     initrd=None,kopts=None,koptspost=None,ksmeta=None,owners=None,arch=None,breed=None,redhatmanagementkey=None,
-                    osversion=None,delete1=False,delete2=False,recursive=False,**args):
+                    mgmt_classes=None,osversion=None,delete1=False,delete2=False,recursive=False,**args):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
@@ -258,6 +258,7 @@ class CobblerWeb(object):
             self.remote.modify_distro(distro, 'os-version', osversion, self.token)
             self.remote.modify_distro(distro, 'comment', comment, self.token)
             self.remote.modify_distro(distro, 'redhat_management_key', redhatmanagementkey, self.token)
+            self.remote.modify_distro(distro, 'mgmt_classes', mgmt_classes, self.token)
 
             # now time to save, do we want to run duplication checks?
             self.remote.save_distro(distro, self.token, editmode)
@@ -514,7 +515,7 @@ class CobblerWeb(object):
                     virtpath=None,virtram=None,virttype=None,virtcpus=None,virtfilesize=None,
                     name_servers=None,name_servers_search=None,
                     power_type=None, power_user=None, power_pass=None, power_id=None, power_address=None,
-                    gateway=None,hostname=None,redhatmanagementkey=None,delete1=None, delete2=None, **args):
+                    gateway=None,hostname=None,redhatmanagementkey=None,mgmt_classes=None,delete1=None, delete2=None, **args):
 
 
         if not self.__xmlrpc_setup():
@@ -569,6 +570,7 @@ class CobblerWeb(object):
             self.remote.modify_system(system, 'gateway', gateway, self.token)
             self.remote.modify_system(system, 'hostname', hostname, self.token)
             self.remote.modify_system(system, 'redhat_management_key', redhatmanagementkey, self.token)
+            self.remote.modify_system(system, 'mgmt_classes', mgmt_classes, self.token)
 
             interfaces = args.get("interface_list","")
             interfaces = interfaces.split(",")
@@ -679,7 +681,7 @@ class CobblerWeb(object):
                      ksmeta=None,owners=None,enablemenu=None,virtfilesize=None,virtram=None,virttype=None,
                      virtpath=None,repos=None,dhcptag=None,delete1=False,delete2=False,
                      parent=None,virtcpus=None,virtbridge=None,subprofile=None,server_override=None,
-                     name_servers=None,name_servers_search=None,redhatmanagementkey=None,recursive=False,**args):
+                     name_servers=None,name_servers_search=None,redhatmanagementkey=None,mgmt_classes=None,recursive=False,**args):
 
         if not self.__xmlrpc_setup():
             return self.xmlrpc_auth_failure()
@@ -748,6 +750,7 @@ class CobblerWeb(object):
             self.remote.modify_profile(profile, 'name_servers', name_servers, self.token)
             self.remote.modify_profile(profile, 'name_servers_search', name_servers_search, self.token)
             self.remote.modify_profile(profile, 'redhat_management_key', redhatmanagementkey, self.token)
+            self.remote.modify_profile(profile, 'mgmt_classes', mgmt_classes, self.token)
 
             if repos is None:
                 repos = []