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 #24192 from rallytime/bp-20474

Browse source 
Backport #20474 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-27 23:16:18 -06:00
commit 8a085a2592
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/clouds/vsphere.py
View file

@ -361,7 +361,13 @@ def _deploy(vm_):
'script_env': config.get_cloud_config_value(
'script_env', vm_, __opts__
),
'minion_conf': salt.utils.cloud.minion_config(__opts__, vm_)
'minion_conf': salt.utils.cloud.minion_config(__opts__, vm_),
'sudo': config.get_cloud_config_value(
'sudo', vm_, __opts__, default=(template_user != 'root')
),
'sudo_password': config.get_cloud_config_value(
'sudo_password', vm_, __opts__, default=None
)
}
# Store what was used to the deploy the VM