valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19717 from sjansen/patch-4

Browse Source 
Enable salt-cloud bootstrap with ssh gateway
This commit is contained in:
Thomas S Hatch 2015-01-14 12:15:16 -07:00
commit 4e79364821
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/cloud/clouds/ec2.py
View File

@ -1887,7 +1887,7 @@ def wait_for_instance(
data = {}
ssh_gateway_config = vm_.get(
'ssh_gateway_config', get_ssh_gateway_config(vm_)
'gateway', get_ssh_gateway_config(vm_)
)
salt.utils.cloud.fire_event(
@ -2059,8 +2059,7 @@ def create(vm_=None, call=None):
# Get SSH Gateway config early to verify the private_key,
# if used, exists or not. We don't want to deploy an instance
# and not be able to access it via the gateway.
ssh_gateway_config = get_ssh_gateway_config(vm_)
vm_['ssh_gateway_config'] = ssh_gateway_config
vm_['gateway'] = get_ssh_gateway_config(vm_)
location = get_location(vm_)
vm_['location'] = location