Use ssh_username if it is set

This commit is contained in:
K Jonathan Harker 2012-10-25 01:38:42 +00:00
parent ed9be36302
commit 808dfea063

View File

@ -131,9 +131,15 @@ def create(vm_):
host_addr = data.public_ips[0] host_addr = data.public_ips[0]
else: else:
host_addr = None host_addr = None
if 'ssh_username' in vm_:
ssh_user = vm_['ssh_username']
else:
ssh_user = 'root'
deployed = saltcloud.utils.deploy_script( deployed = saltcloud.utils.deploy_script(
host=host_addr, host=host_addr,
username='root', username=ssh_user,
password=data.extra['password'], password=data.extra['password'],
script=deploy_script.script, script=deploy_script.script,
name=vm_['name'], name=vm_['name'],