saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Do not SSH to the instance if deploy is False

Browse source
This commit is contained in:
Aditya Kulkarni 2015-12-21 11:57:25 -05:00 • committed by rallytime
parent e7fe24dc64
commit 09f208fe63
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/cloud/clouds/ec2.py
View file

@ -2469,13 +2469,15 @@ def create(vm_=None, call=None):
log.debug('Salt interface set to: {0}'.format(salt_ip_address))
vm_['salt_host'] = salt_ip_address
display_ssh_output = config.get_cloud_config_value(
'display_ssh_output', vm_, __opts__, default=True
)
if config.get_cloud_config_value(
'deploy', vm_, __opts__, default=True):
display_ssh_output = config.get_cloud_config_value(
'display_ssh_output', vm_, __opts__, default=True
)
vm_ = wait_for_instance(
vm_, data, ip_address, display_ssh_output
)
vm_ = wait_for_instance(
vm_, data, ip_address, display_ssh_output
)
# The instance is booted and accessible, let's Salt it!
ret = instance.copy()