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

Merge pull request #42788 from amendlik/saltify-timeout

Browse source 
Remove waits and retries from Saltify deployment
This commit is contained in:
Nicole Thomas 2017-08-11 11:38:05 -04:00 • committed by GitHub
commit 5962c9588b
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/utils/cloud.py
View file

@ -311,6 +311,11 @@ def bootstrap(vm_, opts):
}
}
if vm_.get('driver', 'none:none').split(':')[1] == 'saltify':
saltify_driver = True
else:
saltify_driver = False
key_filename = salt.config.get_cloud_config_value(
'key_filename', vm_, opts, search_global=False,
default=salt.config.get_cloud_config_value(
@ -475,6 +480,9 @@ def bootstrap(vm_, opts):
'make_minion', vm_, opts, default=True
)
if saltify_driver:
deploy_kwargs['wait_for_passwd_maxtries'] = 0 # No need to wait/retry with Saltify
win_installer = salt.config.get_cloud_config_value(
'win_installer', vm_, opts
)
@ -499,6 +507,8 @@ def bootstrap(vm_, opts):
deploy_kwargs['winrm_port'] = salt.config.get_cloud_config_value(
'winrm_port', vm_, opts, default=5986
)
if saltify_driver:
deploy_kwargs['port_timeout'] = 1 # No need to wait/retry with Saltify
# Store what was used to the deploy the VM
event_kwargs = copy.deepcopy(deploy_kwargs)