diff options
| -rw-r--r-- | cobbler/action_sync.py | 2 | ||||
| -rwxr-xr-x | cobbler/cobbler.py | 1 | ||||
| -rw-r--r-- | cobbler/item_system.py | 4 | ||||
| -rw-r--r-- | cobbler/serializer.py | 4 | ||||
| -rw-r--r-- | cobbler/utils.py | 16 |
5 files changed, 5 insertions, 22 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 6ce9d96..5d3cd10 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -151,7 +151,6 @@ class BootSync: if mac is None or mac == "": # can't write a DHCP entry for this system - # FIXME: should this be a warning? continue counter = counter + 1 @@ -222,7 +221,6 @@ class BootSync: ip = interface["ip_address"] if mac is None or mac == "": # can't write this w/o a MAC address - # FIXME -- should this raise a warning? continue if ip is not None and ip != "": fh.write(mac.upper() + "\t" + ip + "\n") diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py index e9c1a5f..59f1783 100755 --- a/cobbler/cobbler.py +++ b/cobbler/cobbler.py @@ -396,7 +396,6 @@ class BootCLI: if key == "--inherit": return True except: - traceback.print_exc() # FIXME: remove pass return False diff --git a/cobbler/item_system.py b/cobbler/item_system.py index 9f29095..d7c71e1 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -222,7 +222,6 @@ class System(item.Item): return True def set_virt_bridge(self,bridge,interface="intf0"): - # FIXME: validate intf = self.__get_interface(interface) intf["virt_bridge"] = bridge return True @@ -314,10 +313,7 @@ class System(item.Item): 'profile' : self.profile, 'kernel_options' : self.kernel_options, 'ks_meta' : self.ks_meta, - #'ip_address' : self.ip_address, 'netboot_enabled' : self.netboot_enabled, - #'hostname' : self.hostname, - #'mac_address' : self.mac_address, 'parent' : self.parent, 'depth' : self.depth, 'kickstart' : self.kickstart, diff --git a/cobbler/serializer.py b/cobbler/serializer.py index 35ff2d9..871aad9 100644 --- a/cobbler/serializer.py +++ b/cobbler/serializer.py @@ -55,7 +55,3 @@ def __get_storage_module(collection_type): else: return MODULE_CACHE[collection_type] - # FIXME: this is always fixed currently, and should not be. - return - - diff --git a/cobbler/utils.py b/cobbler/utils.py index 48e79d8..f8b2193 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -315,13 +315,17 @@ def blender(remove_hashes, root_obj): def flatten(data): # convert certain nested hashes to strings. - # FIXME: this function should be made more generic + # this is only really done for the ones koan needs as strings + # this should not be done for everything if data.has_key("kernel_options"): data["kernel_options"] = hash_to_string(data["kernel_options"]) + # FIXME: why do we flatten this? if data.has_key("ks_meta"): data["ks_meta"] = hash_to_string(data["ks_meta"]) + # FIXME: why do we flatten this? if data.has_key("repos") and type(data["repos"]) == list: data["repos"] = " ".join(data["repos"]) + # FIXME: why do we flatten this? if data.has_key("rpm_list") and type(data["rpm_list"]) == list: data["rpm_list"] = " ".join(data["rpm_list"]) @@ -356,16 +360,6 @@ def __consolidate(node,results): data_item = node_data_copy[field] if results.has_key(field): - # FIXME: remove, we're doing this higher up - # for subobjects (child objects), a value of <<inherit>> - # means defer up the stack, and by definition usage of the API - # must ensure the value is valid somewhere up the stack. So, remove - # any magic values of <<inherit>> prior to blending. - #if data_item == '<<inherit>>': - # # don't load into results hash, the parent will have the - # # data we need. - # continue - # now merge data types seperately depending on whether they are hash, list, # or scalar. if type(data_item) == dict: |