Installing openssh-clients along with puppet

We're using scp to copy puppet modules to the hosts,
The error was being caught and ignored as the code just thought
that puppet applies hadn't finished
https://bugzilla.redhat.com/show_bug.cgi?id=905083

Conflicts:
	packstack/plugins/puppet_950.py

Change-Id: Icd64373cf3c00e84b7ea84d1d8ff14f069fde315
This commit is contained in:
Derek Higgins
2013-01-30 07:00:52 -05:00
parent 70e197a22e
commit 2bd426f646

View File

@@ -51,7 +51,7 @@ def initSequences(controller):
controller.insertSequence("Clean Up", [], [], puppetpresteps, index=0)
puppetsteps = [
{'title': 'Installing Puppet', 'functions': [installpuppet]},
{'title': 'Installing Dependencies', 'functions':[installdeps]},
{'title': 'Copying Puppet modules and manifests', 'functions':[copyPuppetModules]},
{'title': 'Applying Puppet manifests', 'functions':[applyPuppetManifest]},
]
@@ -64,10 +64,11 @@ def runCleanup():
localserver.execute()
def installpuppet():
def installdeps():
for hostname in gethostlist(controller.CONF):
server = utils.ScriptRunner(hostname)
server.append("rpm -q puppet || yum install -y puppet")
server.append("rpm -q openssh-clients || yum install -y openssh-clients")
server.execute()