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 #48956 from gtmanfred/openstack

Browse source 
if booted from volume, use string from image
This commit is contained in:
Nicole Thomas 2018-08-07 12:39:44 -04:00 • committed by GitHub
commit bad995462c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/cloud/clouds/openstack.py
View file

@ -466,7 +466,10 @@ def show_instance(name, conn=None, call=None):
ret['public_ips'] = _get_ips(node, 'public')
ret['floating_ips'] = _get_ips(node, 'floating')
ret['fixed_ips'] = _get_ips(node, 'fixed')
ret['image'] = conn.get_image(node.image.id).name
if isinstance(node.image, six.string_types):
ret['image'] = node.image
else:
ret['image'] = conn.get_image(node.image.id).name
return ret