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 #47308 from rallytime/bp-47287

Browse source 
Back-port #47287 to 2018.3
This commit is contained in:
Nicole Thomas 2018-04-27 09:50:49 -04:00 • committed by GitHub
commit b6df5facce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/cloud/clouds/azurearm.py
View file

@ -1064,10 +1064,12 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
)
)
vm_password = config.get_cloud_config_value(
'ssh_password', vm_, __opts__, search_global=True,
default=config.get_cloud_config_value(
'win_password', vm_, __opts__, search_global=True
vm_password = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'ssh_password', vm_, __opts__, search_global=True,
default=config.get_cloud_config_value(
'win_password', vm_, __opts__, search_global=True
)
)
)