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

Merge pull request #12723 from gtmanfred/develop

Browse Source 
Fixes #12719
This commit is contained in:
Joseph Hall 2014-05-12 21:12:44 -06:00
commit 2bd5735438
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/openstack/nova.py
View File

@ -744,7 +744,7 @@ class SaltNova(object):
for net in network_lst:
if net.label == name:
return net.__dict__
return False
return {}
def network_show(self, name):
'''
@ -806,7 +806,9 @@ class SaltNova(object):
'''
nt_ks = self.compute_conn
serverid = self._server_uuid_from_name(name)
networkid = self.network_show(net_name).get('id', '')
networkid = self.network_show(net_name).get('id', None}
if networkid is None:
return {net_name: False}
nets = nt_ks.virtual_interfaces.create(networkid, serverid)
return nets