aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack-controller-test-config
diff options
context:
space:
mode:
authorVu Tran <vu.tran@windriver.com>2014-07-09 14:41:33 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-17 00:12:13 -0400
commit511c65ab74d06733ceabaed7ac45cbfcd144ea46 (patch)
tree1d19c598756b69a80f5d06f675f5f798a87d949b /meta-openstack-controller-test-config
parent8b036d28a3af83ebf319c9b602f739458ac859b9 (diff)
downloadmeta-cloud-services-511c65ab74d06733ceabaed7ac45cbfcd144ea46.tar.gz
meta-cloud-services-511c65ab74d06733ceabaed7ac45cbfcd144ea46.tar.bz2
meta-cloud-services-511c65ab74d06733ceabaed7ac45cbfcd144ea46.zip
glance test config use latest cirros image
cirros image installed at /root/images/ can be upgraded to different version. Instead of hardcoding cirros image name, let find cirros image at runtime as glance test config is not bounded to a specific cirros image. Signed-off-by: Vu Tran <vu.tran@windriver.com>
Diffstat (limited to 'meta-openstack-controller-test-config')
-rw-r--r--meta-openstack-controller-test-config/recipes-devtools/python/python-glance/glance-test-config.init3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-openstack-controller-test-config/recipes-devtools/python/python-glance/glance-test-config.init b/meta-openstack-controller-test-config/recipes-devtools/python/python-glance/glance-test-config.init
index 2186421e..29c62fc8 100644
--- a/meta-openstack-controller-test-config/recipes-devtools/python/python-glance/glance-test-config.init
+++ b/meta-openstack-controller-test-config/recipes-devtools/python/python-glance/glance-test-config.init
@@ -39,7 +39,8 @@ start()
id=`sed -n '4p' < $temp_file | get_field 1`
glance image-show $id > /dev/null 2>&1
if [ "$?" != "0" ]; then
- id=`glance image-create --name myfirstimage --is-public true --container-format bare --disk-format qcow2 --file /root/images/cirros-0.3.0-x86_64-disk.img | grep " id " | get_field 2`
+ cirros_image_file=`find /root/images/ -name "cirros*.img" | tail -1`
+ id=`glance image-create --name myfirstimage --is-public true --container-format bare --disk-format qcow2 --file ${cirros_image_file} | grep " id " | get_field 2`
fi
sed -i "s/^image_ref = .*/image_ref = ${id}/" $TEMPEST_CONF_FILE
sed -i "s/^image_ref_alt = .*/image_ref_alt = ${id}/" $TEMPEST_CONF_FILE