Make sure Ansible tests only use cirros images

It's possible enabling OpenStack things can cause other images other
than cirros to be made available (looking at you Magnum). We should
make sure our Ansible tests only look for Cirros.

Change-Id: Iefc01f8033629937552861366b9ddaac8058b249
This commit is contained in:
David Shrewsbury 2016-05-13 09:49:20 -04:00
parent d026cab5c7
commit a1ab68cd2b

View File

@ -84,7 +84,7 @@ fi
# Until we have a module that lets us determine the image we want from # Until we have a module that lets us determine the image we want from
# within a playbook, we have to find the image here and pass it in. # within a playbook, we have to find the image here and pass it in.
# We use the openstack client instead of nova client since it can use clouds.yaml. # We use the openstack client instead of nova client since it can use clouds.yaml.
IMAGE=`openstack --os-cloud=${CLOUD} image list -f value -c Name | grep -v -e ramdisk -e kernel` IMAGE=`openstack --os-cloud=${CLOUD} image list -f value -c Name | grep cirros | grep -v -e ramdisk -e kernel`
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
echo "Failed to find Cirros image" echo "Failed to find Cirros image"