Merge pull request #17 from Pansanel/mem

Add images that do not have the STATUS tag

Author: Pansanel

cloudkeeper_os/imagemanager.py

@@ -217,7 +217,7 @@ def update_image_list_identifiers(self):
 
             for image in image_list:
                 if IMAGE_LIST_ID_TAG in image:
-                    if IMAGE_STATUS_TAG in image and image[IMAGE_STATUS_TAG] != 'EOL':
+                    if (IMAGE_STATUS_TAG not in image) or (image[IMAGE_STATUS_TAG] != 'EOL'):
                         if image[IMAGE_LIST_ID_TAG] not in appliances:
                             appliances[image[IMAGE_LIST_ID_TAG]] = []
                         appliances[image[IMAGE_LIST_ID_TAG]].append(image)
@@ -237,7 +237,7 @@ def get_appliances(self, image_list_identifier):
                 elif field == 'image_list_identifier':
                     key = IMAGE_LIST_ID_TAG
                 else:
-                    key = 'APPLIANCE_'+str.upper(field)
+                    key = 'APPLIANCE_' + str.upper(field)
                 if key in image:
                     if field in APPLIANCE_INT_VALUES:
                         properties[field] = long(image[key])