x/packstack
Code Issues Proposed changes

Some pep8 changes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
packstack/modules/ospluginutils.py
View File

@@ -25,11 +25,12 @@ class NovaConfig(object):
return entry
entry += "nova_config{\n"
for k,v in self.options.items():
entry += ' "%s": value => "%s";\n'%(k,v)
for k, v in self.options.items():
entry += ' "%s": value => "%s";\n' % (k, v)
entry += "}"
return entry
class ManifestFiles(object):
def __init__(self):
self.filelist = []
@@ -37,7 +38,7 @@ class ManifestFiles(object):
# continuous manifest file that have the same marker can be
# installed in parallel, if on different servers
def addFile(self, filename, marker):
for f,p in self.filelist:
for f, p in self.filelist:
if f == filename:
return
self.filelist.append((filename, marker,))
@@ -46,9 +47,11 @@ 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
return fp.read() % controller.CONF
def appendManifestFile(manifest_name, data, marker=''):
if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
@@ -59,9 +62,10 @@ def appendManifestFile(manifest_name, data, marker=''):
fp.write("\n")
fp.write(data)
def gethostlist(CONF):
hosts = []
for key,value in CONF.items():
for key, value in CONF.items():
if key.endswith("_HOST"):
value = value.split('/')[0]
if value not in hosts:

38
packstack/plugins/puppet_950.py
View File

@@ -20,9 +20,10 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
logging.debug("plugin %s loaded", __name__)
PUPPETDIR = os.path.abspath(os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet'))
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
@@ -30,12 +31,12 @@ def initConfig(controllerObject):
paramsList = [
]
groupDict = { "GROUP_NAME" : "PUPPET",
"DESCRIPTION" : "Puppet Config paramaters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True}
groupDict = {"GROUP_NAME" : "PUPPET",
"DESCRIPTION" : "Puppet Config paramaters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True}
controller.addGroup(groupDict, paramsList)
@@ -53,29 +54,33 @@ def initSequences(controller):
]
controller.addSequence("Puppet", [], [], puppetsteps)
def runCleanup():
localserver = utils.ScriptRunner()
localserver.append("rm -rf %s/*pp"%basedefs.PUPPET_MANIFEST_DIR)
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 = ""
if platform.linux_distribution()[0] == "Fedora":
tar_opts += "--exclude create_resources "
for hostname in gethostlist(controller.CONF):
server.append("cd %s/puppet"%basedefs.DIR_PROJECT_DIR)
server.append("tar %s --dereference -czf - modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C %s -xzf -"%(tar_opts, hostname, basedefs.VAR_DIR))
server.append("cd %s"%basedefs.PUPPET_MANIFEST_DIR)
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.append("cd %s/puppet" % basedefs.DIR_PROJECT_DIR)
server.append("tar %s --dereference -czf - modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C %s -xzf -" % (tar_opts, hostname, basedefs.VAR_DIR))
server.append("cd %s" % basedefs.PUPPET_MANIFEST_DIR)
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,14 +110,15 @@ 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
print "Applying " + manifest
server = utils.ScriptRunner(hostname)
logfile = "%s.log"%manifest
logfile = "%s.log" % manifest
currently_running.append((hostname, logfile))
command = "( flock %s/ps.lock puppet apply --modulepath %s/modules %s > %s_ 2>&1 < /dev/null ; mv %s_ %s ) > /dev/null 2>&1 < /dev/null &"%(basedefs.VAR_DIR, basedefs.VAR_DIR, manifest, logfile, logfile, logfile)
command = "( flock %s/ps.lock puppet apply --modulepath %s/modules %s > %s_ 2>&1 < /dev/null ; mv %s_ %s ) > /dev/null 2>&1 < /dev/null &" % (basedefs.VAR_DIR, basedefs.VAR_DIR, manifest, logfile, logfile, logfile)
server.append(command)
server.execute()