made changes to get rid of hostinfo.xml file have GenerateHostInfo update clients.xml

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1659 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 7 insertions, 8 deletions

diff --git a/src/sbin/StatReports b/src/sbin/StatReports
index 439998718..d08d38a57 100644
--- a/src/sbin/StatReports
+++ b/src/sbin/StatReports
@@ -30,8 +30,7 @@ def generatereport(rspec, nrpt):
     pattern = re.compile( '|'.join([item.get("name") for item in reportspec.findall('Machine')]))
 
     for node in nodereprt.findall('Node'):
-        if not (node.findall("HostInfo") and node.findall("Statistics") and
-                node.find("HostInfo").get("fqdn") and pattern.match(node.get('name'))):
+        if not (node.findall("Statistics") and pattern.match(node.get('name'))):
             # don't know enough about node
             nodereprt.remove(node)
             continue
@@ -173,12 +172,12 @@ if __name__ == '__main__':
 
 
     #See if hostinfo.xml exists, and is less than 23.5 hours old
-    try:
-        hostinstat = os.stat(hostinfopath)
-        if (time() - hostinstat[9])/(60*60) > 23.5:
-            os.system('GenerateHostInfo')#Generate HostInfo needs to be in path
-    except OSError:
-        os.system('GenerateHostInfo')#Generate HostInfo needs to be in path
+    #try:
+        #hostinstat = os.stat(hostinfopath)
+        #if (time() - hostinstat[9])/(60*60) > 23.5:
+    os.system('GenerateHostInfo')#Generate HostInfo needs to be in path
+    #except OSError:
+    #    os.system('GenerateHostInfo')#Generate HostInfo needs to be in path
 
 
     '''Reads Data & Config files'''