From f119121d21fa0446197b26378091677daac1606a Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 16 Feb 2017 16:33:08 -0500 Subject: [PATCH] clean up virt drivers that we do image logic for openvz is not in the nova tree, and is referencing a crazy old image, we're going to assume that if anyone is using this they can build a devstack plugin. drop doing anything by default because this actually requires that we special case things like ironic in tree to *not* do anything by default. Change-Id: I9d33b98263c3d52a95b9983e90eb0b341fa1d363 --- stackrc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/stackrc b/stackrc index 95f017b9b1..97819d712b 100644 --- a/stackrc +++ b/stackrc @@ -636,9 +636,6 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then IMAGE_URLS+="," fi case "$VIRT_DRIVER" in - openvz) - DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64} - IMAGE_URLS+="http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz";; libvirt) case "$LIBVIRT_TYPE" in lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc @@ -656,13 +653,6 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.4-x86_64-disk} IMAGE_URLS+="http://ca.downloads.xensource.com/OpenStack/cirros-0.3.4-x86_64-disk.vhd.tgz" IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";; - ironic) - # NOTE(lucasagomes): The logic setting the default image - # now lives in the Ironic tree - ;; - *) # Default to Cirros qcow2 image file - DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img} - IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";; esac DOWNLOAD_DEFAULT_IMAGES=False fi