summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Hagedorn <hagedorn@mcs.anl.gov>2005-11-25 10:19:00 +0000
committerJoey Hagedorn <hagedorn@mcs.anl.gov>2005-11-25 10:19:00 +0000
commit56fb8cef1b99c4b0e37a4816f78fa64e72f40ebc (patch)
treefbe03bdd7e2c9609eafde55586a45728a4a88b92
parentd16ea5403ea501bb3df22c9a693af83f18d1719c (diff)
downloadbcfg2-56fb8cef1b99c4b0e37a4816f78fa64e72f40ebc.tar.gz
bcfg2-56fb8cef1b99c4b0e37a4816f78fa64e72f40ebc.tar.bz2
bcfg2-56fb8cef1b99c4b0e37a4816f78fa64e72f40ebc.zip
updated GenerateHostInfo to not require metadata section of bcfg config file, and fixed typo
(Logical change 1.366) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1533 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/sbin/GenerateHostInfo10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sbin/GenerateHostInfo b/src/sbin/GenerateHostInfo
index 8c13f3157..1993ddb19 100644
--- a/src/sbin/GenerateHostInfo
+++ b/src/sbin/GenerateHostInfo
@@ -29,9 +29,9 @@ def pretty_print(element, level=0):
if __name__ == '__main__':
c = ConfigParser()
c.read(['/etc/bcfg2.conf'])
- hostinfopath = "%s/hostinfo.xml" % c.get('server', 'metadata')
- metadatapath = "%s/metadata.xml" % c.get('server', 'metadata')
- configpath = "%s/report-configuration.xml" % c.get('server', 'metadata')
+ configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository')
+ hostinfopath = "%s/etc/hostinfo.xml" % c.get('server', 'repository')
+ metadatapath = "%s/etc/metadata.xml" % c.get('server', 'repository')
sendmailpath = c.get('statistics','sendmailpath')
metaElement = parse(metadatapath)
@@ -59,13 +59,13 @@ if __name__ == '__main__':
chost = pids[cpid]
del pids[cpid]
if status == 0:
- SubElement(HostInfo, "HostInfo", name=chost, fqdn=chost, pingeable='Y')
+ SubElement(HostInfo, "HostInfo", name=chost, fqdn=chost, pingable='Y')
else:
if chost.count('.') > 0:
fullnames[chost.split('.')[0]] = chost
hostlist.append(chost.split('.')[0])
else:
- SubElement(HostInfo, "HostInfo", name=fullnames[chost], fqdn=fullnames[chost], pingeable='N')
+ SubElement(HostInfo, "HostInfo", name=fullnames[chost], fqdn=fullnames[chost], pingable='N')
except:
pass