Rename some templates, remove proxy logic that is not necc. for new performance

plans, remove watcher.py reference

3 files changed, 12 insertions, 41 deletions

diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index d2f2d05..867b950 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -256,12 +256,12 @@ class Importer:
    def set_kickstart(self, profile, flavor, major, minor):
        if flavor == "fedora":
            if major >= 6:
-                return profile.set_kickstart("/etc/cobbler/kickstart_fc6.ks")
+                return profile.set_kickstart("/etc/cobbler/sample.ks")
        if flavor == "redhat" or flavor == "centos":
            if major >= 5:
-                return profile.set_kickstart("/etc/cobbler/kickstart_fc6.ks")
+                return profile.set_kickstart("/etc/cobbler/sample.ks")
        print _("- using default kickstart file choice")
-       return profile.set_kickstart("/etc/cobbler/kickstart_fc5.ks")
+       return profile.set_kickstart("/etc/cobbler/legacy.ks")
 
    # ---------------------------------------------------------------------
 
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 47069bc..f94ca59 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -387,10 +387,9 @@ class BootSync:
 
         # FIXME: watcher is more of a request than a packaged file
         # we should eventually package something and let it do something important"
-        pattern1 = "wget \"http://%s/cblr/watcher.py?%s_%s=%s\""
-        pattern2 = "wget \"http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s\""
-        pattern3 = "wget \"http://%s/cobbler/%s/%s/ks.cfg\" -O /root/cobbler.ks"
-        pattern4 = "wget \"http://%s/cgi-bin/cobbler/post_install_trigger.cgi?system=%s\""
+        pattern1 = "wget \"http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s\""
+        pattern2 = "wget \"http://%s/cobbler/%s/%s/ks.cfg\" -O /root/cobbler.ks"
+        pattern3 = "wget \"http://%s/cgi-bin/cobbler/post_install_trigger.cgi?system=%s\""
 
         blend_this = profile
         if system:
@@ -401,18 +400,16 @@ class BootSync:
 
         buf = ""
         if system is not None:
-            buf = buf + pattern1 % (blended["server"], "system", "done", system.name)
             if str(self.settings.pxe_just_once).upper() in [ "1", "Y", "YES", "TRUE" ]:
-                buf = buf + "\n" + pattern2 % (blended["server"], system.name)
+                buf = buf + "\n" + pattern1 % (blended["server"], system.name)
             if kickstart and os.path.exists(kickstart):
-                buf = buf + "\n" + pattern3 % (blended["server"], "kickstarts_sys", system.name)
+                buf = buf + "\n" + pattern2 % (blended["server"], "kickstarts_sys", system.name)
             if self.settings.run_post_install_trigger:
-                buf = buf + "\n" + pattern4 % (blended["server"], system.name)
+                buf = buf + "\n" + pattern3 % (blended["server"], system.name)
 
         else:
-            buf = buf + pattern1 % (blended["server"], "profile", "done", profile.name)
             if kickstart and os.path.exists(kickstart):
-                buf = buf + "\n" + pattern3 % (blended["server"], "kickstarts", profile.name)
+                buf = buf + "\n" + pattern2 % (blended["server"], "kickstarts", profile.name)
             
         return buf
 
diff --git a/cobbler/collection.py b/cobbler/collection.py
index a06a663..2fe3967 100644
--- a/cobbler/collection.py
+++ b/cobbler/collection.py
@@ -27,31 +27,6 @@ import item_repo
 
 from rhpl.translate import _, N_, textdomain, utf8
 
-class ProxiedItem:
-
-    def __init__(self,collection,seed_data):
-
-        self.real_object = None
-        self.collection  = collection
-        self.config      = collection.config
-        self.seed_data   = seed_data
- 
-
-    def __getattr__(self,name):
-
-        if self.real_object is not None:
-            return getattr(self.real_object,name)
-        
-        if name == "name":
-            return self.seed_data["name"]
-
-        self.real_object = self.collection.factory_produce(
-            self.config,
-            self.seed_data
-        )                
-
-        return getattr(self.real_object, name)
-
 class Collection(serializable.Serializable):
 
     def __init__(self,config):
@@ -120,9 +95,8 @@ class Collection(serializable.Serializable):
         if datastruct is None:
             return
         for seed_data in datastruct:
-            #item = self.factory_produce(self.config,seed_data)
-            #self.add(item)
-            self.add(ProxiedItem(self,seed_data))
+            item = self.factory_produce(self.config,seed_data)
+            self.add(item)
 
     def add(self,ref,save=False,with_copy=False,with_triggers=True,with_sync=True,quick_pxe_update=False):
         """