From b5d71271a5a1e20fbef0f440c70786a5066df3ac Mon Sep 17 00:00:00 2001 From: Stuart Jansen Date: Tue, 13 Jan 2015 19:02:40 -0700 Subject: [PATCH] Enable salt-cloud bootstrap with ssh gateway --- salt/cloud/clouds/ec2.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py index 1aeb78a00d..9ede34928b 100644 --- a/salt/cloud/clouds/ec2.py +++ b/salt/cloud/clouds/ec2.py @@ -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