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

Change confusing "nt_ks" to "g_client"

Browse source 
Because this is no "neutron keystone" but an
instance of glanceclient.v2.client.Client.
This commit is contained in:
Florian Ermisch 2015-06-29 16:17:42 +02:00
parent fa2bd1a79c
commit 9f923edfab
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/glance.py
View file

@ -208,15 +208,15 @@ def image_delete(id=None, name=None, profile=None): # pylint: disable=C0103
salt '*' glance.image_delete id=c2eb2eb0-53e1-4a80-b990-8ec887eae7df
salt '*' glance.image_delete name=f16-jeos
'''
nt_ks = _auth(profile)
g_client = _auth(profile)
if name:
for image in nt_ks.images.list():
for image in g_client.images.list():
if image.name == name:
id = image.id # pylint: disable=C0103
continue
if not id:
return {'Error': 'Unable to resolve image id'}
nt_ks.images.delete(id)
g_client.images.delete(id)
ret = 'Deleted image with ID {0}'.format(id)
if name:
ret += ' ({0})'.format(name)
@ -233,16 +233,16 @@ def image_show(id=None, name=None, profile=None): # pylint: disable=C0103
salt '*' glance.image_show
'''
nt_ks = _auth(profile)
g_client = _auth(profile)
ret = {}
if name:
for image in nt_ks.images.list():
for image in g_client.images.list():
if image.name == name:
id = image.id # pylint: disable=C0103
continue
if not id:
return {'Error': 'Unable to resolve image id'}
image = nt_ks.images.get(id)
image = g_client.images.get(id)
# TODO: Get rid of the wrapping dict, see #24568
ret[image.name] = {
'id': image.id,
@ -275,10 +275,10 @@ def image_list(id=None, profile=None): # pylint: disable=C0103
salt '*' glance.image_list
'''
nt_ks = _auth(profile)
g_client = _auth(profile)
#pformat = pprint.PrettyPrinter(indent=4).pformat
ret = {}
for image in nt_ks.images.list():
for image in g_client.images.list():
#log.debug('Details for image "{0}":'.format(image.name) + \
# '\n{0}'.format(pformat(image)))
#
@ -323,9 +323,9 @@ def _item_list(profile=None):
salt '*' glance.item_list
'''
nt_ks = _auth(profile)
g_client = _auth(profile)
ret = []
for item in nt_ks.items.list():
for item in g_client.items.list():
ret.append(item.__dict__)
#ret[item.name] = {
# 'name': item.name,