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

Refine sizes for EC2

Browse Source
This commit is contained in:
Thomas S Hatch 2012-07-15 01:40:10 -06:00
parent f755924627
commit 4e651d5cf0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
saltcloud/clouds/EC2.py
View File

@ -79,10 +79,11 @@ def avail_images():
images = conn.list_images() images = conn.list_images()
ret = {} ret = {}
for img in images: for img in images:
ret[img.name] = {}
for attr in dir(img): for attr in dir(img):
if attr.startswith('_'): if attr.startswith('_'):
continue continue
ret[attr] = getattr(img, attr) ret[img.name][attr] = getattr(img, attr)
return ret return ret
@ -95,10 +96,11 @@ def avail_sizes():
sizes = conn.list_sizes() sizes = conn.list_sizes()
ret = {} ret = {}
for size in sizes: for size in sizes:
ret[size.name] = {}
for attr in dir(size): for attr in dir(size):
if attr.startswith('_'): if attr.startswith('_'):
continue continue
ret[attr] = getattr(size, attr) ret[size.name][attr] = getattr(size, attr)
return ret return ret