fix bug where nova driver exits with no adminPass

salt/cloud/clouds/nova.py

@@ -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_

salt/utils/openstack/nova.py

@@ -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