diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2004-10-22 18:36:22 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2004-10-22 18:36:22 +0000 |
commit | bbe21f3ef7d15c9bc4b2b411f5258d0a9a16a0e3 (patch) | |
tree | 4f9a9228c90ff7aff0db7e8076eca799e5e42f53 /src/lib | |
parent | 4f0711d3c9d3415d5fc1e1cfe76f03c07e40c907 (diff) | |
download | bcfg2-bbe21f3ef7d15c9bc4b2b411f5258d0a9a16a0e3.tar.gz bcfg2-bbe21f3ef7d15c9bc4b2b411f5258d0a9a16a0e3.tar.bz2 bcfg2-bbe21f3ef7d15c9bc4b2b411f5258d0a9a16a0e3.zip |
pylint fixups
(Logical change 1.112)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@503 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Client/Gentoo.py | 5 | ||||
-rw-r--r-- | src/lib/Server/Generators/fs.py | 6 | ||||
-rw-r--r-- | src/lib/Server/Generators/sshbase.py | 19 |
3 files changed, 17 insertions, 13 deletions
diff --git a/src/lib/Client/Gentoo.py b/src/lib/Client/Gentoo.py index 3ebda2fab..3773fafb1 100644 --- a/src/lib/Client/Gentoo.py +++ b/src/lib/Client/Gentoo.py @@ -1,7 +1,8 @@ # This is the bcfg2 support for gentoo -# $Id: $ +'''This provides (vestigal) Gentoo support''' +__revision__ = '$Revision$' -from Toolset import Toolset +from Bcfg2.Client.Toolset import Toolset def Detect(): # until the code works diff --git a/src/lib/Server/Generators/fs.py b/src/lib/Server/Generators/fs.py index c4d517044..ebe83703c 100644 --- a/src/lib/Server/Generators/fs.py +++ b/src/lib/Server/Generators/fs.py @@ -1,7 +1,9 @@ #!/usr/bin/env python -from Generator import Generator, ScopedXMLFile -from elementtree.ElementTree import Element +'''This generator handles MCS filesystem setup''' +__revision__ = '$Revision$' + +from Bcfg2.Server.Generator import Generator, ScopedXMLFile class fs(Generator): '''This generator takes care of mcs filesystem setup''' diff --git a/src/lib/Server/Generators/sshbase.py b/src/lib/Server/Generators/sshbase.py index 08b23ebd2..770ec9fae 100644 --- a/src/lib/Server/Generators/sshbase.py +++ b/src/lib/Server/Generators/sshbase.py @@ -5,7 +5,7 @@ __revision__ = '$Revision$' from binascii import b2a_base64 from os import rename, system -from socket import gethostbyname +from socket import gethostbyname, gaierror from Bcfg2.Server.Generator import Generator, DirectoryBacked @@ -31,6 +31,11 @@ class sshbase(Generator): __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' + pubkeys = ["ssh_host_dsa_key.pub.H_%s", + "ssh_host_rsa_key.pub.H_%s", "ssh_host_key.pub.H_%s"] + hostkeys = ["ssh_host_dsa_key.H_%s", + "ssh_host_rsa_key.H_%s", "ssh_host_key.H_%s"] + def __setup__(self): self.repository = DirectoryBacked(self.data, self.core.fam) self.__provides__ = {'ConfigFile': @@ -47,9 +52,7 @@ class sshbase(Generator): client = metadata.hostname filedata = self.repository.entries['ssh_known_hosts'].data ipaddr = gethostbyname(client) - keylist = map(lambda x:x % (client), - ["ssh_host_dsa_key.pub.H_%s", - "ssh_host_rsa_key.pub.H_%s", "ssh_host_key.pub.H_%s"]) + keylist = [x % client for x in self.pubkeys] for hostkey in keylist: filedata += "%s,%s,%s %s" % (client, "%s.mcs.anl.gov"%(client), ipaddr, self.repository.entries[hostkey].data) @@ -82,15 +85,13 @@ class sshbase(Generator): try: ipaddr = gethostbyname(h) output += "%s,%s.mcs.anl.gov,%s %s" % (h, h, ipaddr, entry.data) - except: - pass + except gaierror: + continue self.repository.entries['ssh_known_hosts'].data = output def GenerateHostKeys(self, client): '''Generate new host keys for client''' - keys = ["ssh_host_dsa_key.H_%s", - "ssh_host_rsa_key.H_%s", "ssh_host_key.H_%s"] - keylist = map(lambda x:x % client, keys) + keylist = [x % client for x in self.hostkeys] for hostkey in keylist: if 'ssh_host_rsa_key.H_' in hostkey: keytype = 'rsa' |