Some pep8 changes

This commit is contained in:
Derek Higgins
2012-12-19 12:07:35 -05:00
parent e13d229a38
commit 1e49623682
2 changed files with 36 additions and 26 deletions

View File

@@ -30,6 +30,7 @@ class NovaConfig(object):
entry += "}"
return entry
class ManifestFiles(object):
def __init__(self):
self.filelist = []
@@ -46,10 +47,12 @@ class ManifestFiles(object):
return [f for f in self.filelist]
manifestfiles = ManifestFiles()
def getManifestTemplate(template_name):
with open(os.path.join(PUPPET_TEMPLATE_DIR, template_name)) as fp:
return fp.read() % controller.CONF
def appendManifestFile(manifest_name, data, marker=''):
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
@@ -59,6 +62,7 @@ def appendManifestFile(manifest_name, data, marker=''):
fp.write("\n")
fp.write(data)
def gethostlist(CONF):
hosts = []
for key, value in CONF.items():

View File

@@ -23,6 +23,7 @@ logging.debug("plugin %s loaded", __name__)
PUPPETDIR = os.path.abspath(os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet'))
MODULEDIR = os.path.join(PUPPETDIR, "modules")
def initConfig(controllerObject):
global controller
controller = controllerObject
@@ -53,17 +54,20 @@ def initSequences(controller):
]
controller.addSequence("Puppet", [], [], puppetsteps)
def runCleanup():
localserver = utils.ScriptRunner()
localserver.append("rm -rf %s/*pp" % basedefs.PUPPET_MANIFEST_DIR)
localserver.execute()
def installpuppet():
for hostname in gethostlist(controller.CONF):
server = utils.ScriptRunner(hostname)
server.append("rpm -q puppet || yum install -y puppet")
server.execute()
def copyPuppetModules():
server = utils.ScriptRunner()
tar_opts = ""
@@ -76,6 +80,7 @@ def copyPuppetModules():
server.append("tar %s --dereference -czf - ../manifests | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C %s -xzf -" % (tar_opts, hostname, basedefs.VAR_DIR))
server.execute()
def waitforpuppet(currently_running):
while currently_running:
for hostname, log in currently_running:
@@ -105,7 +110,8 @@ def applyPuppetManifest():
lastmarker = marker
for hostname in gethostlist(controller.CONF):
if "/%s_"%hostname not in manifest: continue
if "/%s_" % hostname not in manifest:
continue
print "Applying " + manifest
server = utils.ScriptRunner(hostname)