XMPP_RECIPIENTS = os.environ["BUILDBOT_XMPP_RECIPIENTS"].split(" ")
PUPPET_HOST = {
- "integration": "root@caldance.immae.eu",
+ "integration": [ "-p8022", "root@caldance.immae.eu"],
}
# master.cfg
return compute
@util.renderer
-def puppet_host(props):
+def puppet_ssh_command(props):
environment = props["environment"] if props.hasProperty("environment") else "integration"
- return E.PUPPET_HOST.get(environment, "host.invalid")
+ ssh_command = [
+ "ssh", "-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", "-o", "CheckHostIP=no",
+ "-i", E.SSH_KEY_PATH ]
+ return ssh_command + E.PUPPET_HOST.get(environment, ["host.invalid"])
def deploy_factory(project, locks=[]):
package_dest = util.Interpolate("{0}/%(prop:build)s".format(E.RELEASE_PATH))
factory.addStep(LdapPush(environment=util.Property("environment"),
project=project, build_version=util.Property("build_version"),
build_hash=util.Property("build_hash"), ldap_password=util.Secret("ldap")))
- factory.addStep(steps.MasterShellCommand(command=[
- "ssh", "-o", "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no", "-o", "CheckHostIP=no", "-i", E.SSH_KEY_PATH, puppet_host]))
+ factory.addStep(steps.MasterShellCommand(command=puppet_ssh_command))
return util.BuilderConfig(
name="{}_deploy".format(project.capitalize()),
locks=locks,