Changeset 1321

Timestamp:

01/25/07 12:30:49 (6 years ago)

Author:

mglb1

Message:

Refactor host deletion callback.

• Tidy up the code
• Remove the hosts/<hostname> directory too

File:

• ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py (modified) (2 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -870 +870 @@
     commit = 0
     if session.changeset == 0:
-        session.begin("Removing keys for %s" % (host["host_name"]))
+        session.begin("Removing configuration and keys for deleted host: %s" %
+                (host["host_name"]))
         commit = 1
 
     try:
+        # Remove SSH Keys
         base = "%s/sshkeys" % session.revision.getConfigBase()
-        ensureDirExists("%s/%s" % (base, host["host_name"]))
-        session.revision._checkForModified(base)
         client.svn_client_delete(["%s/%s" % (base, host["host_name"])], True, 
                 session.revision.ctx, session.revision.pool)
-                
-        base = "%s/../ppkeys" % session.revision.getConfigBase()
-        
-        client.svn_client_delete(["%s/root-%s.priv" % (base, host["ip_address"])], True,
-                session.revision.ctx, session.revision.pool)
-        
-        client.svn_client_delete(["%s/root-%s.pub" % (base, host["ip_address"])], True,
+        
+        # Remove CFengine Keys
+        base = "%s/ppkeys" % session.revision.getWorkingDir()
+        client.svn_client_delete(["%s/root-%s.priv" % 
+            (base, host["ip_address"])], True, session.revision.ctx, 
+            session.revision.pool)
+        client.svn_client_delete(["%s/root-%s.pub" % 
+            (base, host["ip_address"])], True, session.revision.ctx, 
+            session.revision.pool)
+        
+        # Remove Configuration
+        base = "%s/hosts" % session.revision.getConfigBase()
+        client.svn_client_delete(["%s/%s" % (base, host["host_name"])], True,
                 session.revision.ctx, session.revision.pool)
     except:
-        (type, value, tb) = sys.exc_info()
-        log_error("Failed to remove  keys for %s! - %s" % \
-                (host["host_name"], value))
-        # Rollback any changes
-        if commit == 1:
-            session.rollback()
-        return False
+        log_error("Failed to remove all configuration/keys for %s!" % 
+                host["host_name"], sys.exc_info())
     
     # Commit changeset if necessary
@@ -901 +902 @@
         
     return True
-                
 
 catchEvent("hostnameChanged")