From a368218a7e46037e6962290a386fc10efc41c9d0 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 16 Dec 2011 10:29:10 -0500 Subject: [PATCH] if using lxc, use cirros rootfs image The cirros 'uec' image contains a kernel, a ramdisk, and a rootfs. However, the rootfs is empty. cirros copies its ramdisk to it on its first boot. That means, if you try this with lxc, there is no filesystem for lxc to boot. So, in the case of lxc, import the rootfs image, which is a populated ext3 filesystem, which is what nova lxc expects. Change-Id: I3ada380c61044a08697b0a964a962b269ea5224c --- stackrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stackrc b/stackrc index 0e700d5521..5be96fc91c 100644 --- a/stackrc +++ b/stackrc @@ -58,7 +58,12 @@ CITEST_BRANCH=master # http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz #IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image #IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image -IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz" # uec style cirros image +case "$LIBVIRT_TYPE" in + lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc + IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; + *) # otherwise, use the uec style image (with kernel, ramdisk, disk) + IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; +esac # allow local overrides of env variables if [ -f ./localrc ]; then