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 #30101 from gtmanfred/2015.8

Browse source 
fix bug where nova driver exits with no adminPass
This commit is contained in:
Joseph Hall 2015-12-31 06:45:16 -07:00
commit 6bc968db9a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/cloud/clouds/nova.py
View file

@ -633,6 +633,9 @@ def request_instance(vm_=None, call=None):
vm_['name'], exc
)
)
if data.extra.get('password', None) is None and vm_.get('key_filename', None) is None:
raise SaltCloudSystemExit('No password returned. Set ssh_key_file.')
vm_['password'] = data.extra.get('password', '')
return data, vm_

2
salt/utils/openstack/nova.py
View file

@ -336,7 +336,7 @@ class SaltNova(OpenStackComputeShell):
)
response = nt_ks.servers.create(**kwargs)
self.uuid = response.id
self.password = response.adminPass
self.password = getattr(response, 'adminPass', None)
start = time.time()
trycount = 0