valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

if password in profile,not overwrite it

Browse Source 
if user provide password in profile,we shouldn't overwrite it
This commit is contained in:
SolarisYan 2016-11-11 13:03:48 +08:00 committed by GitHub
parent 9751e19b61
commit a59b07bf71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cloud/clouds/nova.py
View File

@ -693,8 +693,8 @@ def request_instance(vm_=None, call=None):
vm_['name'], exc
)
)
vm_['password'] = data.extra.get('password', '')
if not vm_.get('password', None):
vm_['password'] = data.extra.get('password', '')
return data, vm_