summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAna Krivokapic <akrivoka@redhat.com>2015-06-12 17:23:32 +0200
committerAna Krivokapic <akrivoka@redhat.com>2015-06-12 17:23:32 +0200
commit483ce65d75ef6b3d057e357ce72f04a6291dd05e (patch)
treef52d291373b50f41a95419fe2ab69de3a1d0b8d3
parentac95523881bf9d3c35983ad616f358fdf2286871 (diff)
downloadtuskar-ui-483ce65d75ef6b3d057e357ce72f04a6291dd05e.tar.gz
Fix image filtering in create node form
Change-Id: I0806b2a85aea095f11f296445e606106293f4985
-rw-r--r--tuskar_ui/infrastructure/nodes/views.py18
1 files changed, 4 insertions, 14 deletions
diff --git a/tuskar_ui/infrastructure/nodes/views.py b/tuskar_ui/infrastructure/nodes/views.py
index 48221ac2..44ed414b 100644
--- a/tuskar_ui/infrastructure/nodes/views.py
+++ b/tuskar_ui/infrastructure/nodes/views.py
@@ -31,19 +31,14 @@ from tuskar_ui.infrastructure.nodes import tables
from tuskar_ui.infrastructure.nodes import tabs
import tuskar_ui.infrastructure.views as infrastructure_views
from tuskar_ui.utils import metering as metering_utils
-from tuskar_ui.utils import utils
def get_kernel_images(request):
try:
kernel_images = glance.image_list_detailed(
- request,
- )[0]
- kernel_images = [image for image in kernel_images
- if utils.check_image_type(image, 'deploy kernel')]
+ request, filters={'disk_format': 'aki'})[0]
except Exception:
- exceptions.handle(request,
- _('Unable to retrieve kernel image list.'))
+ exceptions.handle(request, _('Unable to retrieve kernel image list.'))
kernel_images = []
return kernel_images
@@ -51,14 +46,9 @@ def get_kernel_images(request):
def get_ramdisk_images(request):
try:
ramdisk_images = glance.image_list_detailed(
- request,
- )[0]
- ramdisk_images = [image for image in ramdisk_images
- if utils.check_image_type(
- image, 'deploy ramdisk')]
+ request, filters={'disk_format': 'ari'})[0]
except Exception:
- exceptions.handle(request,
- _('Unable to retrieve ramdisk image list.'))
+ exceptions.handle(request, _('Unable to retrieve ramdisk image list.'))
ramdisk_images = []
return ramdisk_images