From 2bb483d32ec0876f071550a3fc755436d1661681 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 3 Jan 2014 09:41:27 -0500 Subject: [PATCH] clean up ubuntu versions oneiric is long dead, remove references to it whenever possible (one more subtle issue in cinder should be a seperate patch). This includes removing the oneiric only tool build_uec.sh. also remove the bulk of references to quantal, which is 8 months out of support. note: raring only has support for the rest of the month. Change-Id: Ib17502be7572af76dc95560615221b48b970a547 --- files/apts/cinder | 2 +- files/apts/glance | 1 - files/apts/n-cpu | 2 +- files/apts/neutron | 2 +- files/apts/tls-proxy | 2 +- lib/rpc_backend | 5 +- stack.sh | 3 +- tools/build_uec.sh | 302 ----------------------------------------- tools/get_uec_image.sh | 6 +- 9 files changed, 9 insertions(+), 316 deletions(-) delete mode 100755 tools/build_uec.sh diff --git a/files/apts/cinder b/files/apts/cinder index f8e3b6d06d..712fee99ec 100644 --- a/files/apts/cinder +++ b/files/apts/cinder @@ -4,4 +4,4 @@ qemu-utils libpq-dev python-dev open-iscsi -open-iscsi-utils # Deprecated since quantal dist:lucid,oneiric,precise +open-iscsi-utils # Deprecated since quantal dist:precise diff --git a/files/apts/glance b/files/apts/glance index 26826a53c7..22787bc5a2 100644 --- a/files/apts/glance +++ b/files/apts/glance @@ -9,7 +9,6 @@ python-dev python-eventlet python-routes python-greenlet -python-argparse # dist:oneiric python-sqlalchemy python-wsgiref python-pastedeploy diff --git a/files/apts/n-cpu b/files/apts/n-cpu index 88e0144079..29e37603b7 100644 --- a/files/apts/n-cpu +++ b/files/apts/n-cpu @@ -2,7 +2,7 @@ nbd-client lvm2 open-iscsi -open-iscsi-utils # Deprecated since quantal dist:lucid,oneiric,precise +open-iscsi-utils # Deprecated since quantal dist:precise genisoimage sysfsutils sg3-utils diff --git a/files/apts/neutron b/files/apts/neutron index 0f4b69f8ef..5760113c8c 100644 --- a/files/apts/neutron +++ b/files/apts/neutron @@ -18,7 +18,7 @@ python-mysqldb python-pyudev python-qpid # dist:precise dnsmasq-base -dnsmasq-utils # for dhcp_release only available in dist:oneiric,precise,quantal +dnsmasq-utils # for dhcp_release only available in dist:precise rabbitmq-server # NOPRIME qpid # NOPRIME sqlite3 diff --git a/files/apts/tls-proxy b/files/apts/tls-proxy index 0a44015925..8fca42d124 100644 --- a/files/apts/tls-proxy +++ b/files/apts/tls-proxy @@ -1 +1 @@ -stud # only available in dist:precise,quantal +stud # only available in dist:precise diff --git a/lib/rpc_backend b/lib/rpc_backend index ae83e85e89..f59c80096f 100644 --- a/lib/rpc_backend +++ b/lib/rpc_backend @@ -192,9 +192,8 @@ function qpid_is_supported() { GetDistro fi - # Qpid was introduced to Ubuntu in precise, disallow it on oneiric; it is - # not in openSUSE either right now. - ( ! ([[ "$DISTRO" = "oneiric" ]] || is_suse) ) + # Qpid is not in openSUSE + ( ! is_suse ) } diff --git a/stack.sh b/stack.sh index 7c065719c4..c303dc3927 100755 --- a/stack.sh +++ b/stack.sh @@ -131,7 +131,7 @@ disable_negated_services # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f18|f19|f20|opensuse-12.2|rhel6) ]]; then +if [[ ! ${DISTRO} =~ (precise|raring|saucy|trusty|7.0|wheezy|sid|testing|jessie|f18|f19|f20|opensuse-12.2|rhel6) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes" @@ -1203,7 +1203,6 @@ fi # See https://help.ubuntu.com/community/CloudInit for more on cloud-init # # Override ``IMAGE_URLS`` with a comma-separated list of UEC images. -# * **oneiric**: http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz # * **precise**: http://uec-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64.tar.gz if is_service_enabled g-reg; then diff --git a/tools/build_uec.sh b/tools/build_uec.sh deleted file mode 100755 index bce051a0b7..0000000000 --- a/tools/build_uec.sh +++ /dev/null @@ -1,302 +0,0 @@ -#!/usr/bin/env bash - -# **build_uec.sh** - -# Make sure that we have the proper version of ubuntu (only works on oneiric) -if ! egrep -q "oneiric" /etc/lsb-release; then - echo "This script only works with ubuntu oneiric." - exit 1 -fi - -# Keep track of the current directory -TOOLS_DIR=$(cd $(dirname "$0") && pwd) -TOP_DIR=$(cd $TOOLS_DIR/..; pwd) - -# Import common functions -. $TOP_DIR/functions - -cd $TOP_DIR - -# Source params -source ./stackrc - -# Ubuntu distro to install -DIST_NAME=${DIST_NAME:-oneiric} - -# Configure how large the VM should be -GUEST_SIZE=${GUEST_SIZE:-10G} - -# exit on error to stop unexpected errors -set -o errexit -set -o xtrace - -# Abort if localrc is not set -if [ ! -e $TOP_DIR/localrc ]; then - echo "You must have a localrc with ALL necessary passwords defined before proceeding." - echo "See stack.sh for required passwords." - exit 1 -fi - -# Install deps if needed -DEPS="kvm libvirt-bin kpartx cloud-utils curl" -apt_get install -y --force-yes $DEPS || true # allow this to fail gracefully for concurrent builds - -# Where to store files and instances -WORK_DIR=${WORK_DIR:-/opt/uecstack} - -# Where to store images -image_dir=$WORK_DIR/images/$DIST_NAME -mkdir -p $image_dir - -# Start over with a clean base image, if desired -if [ $CLEAN_BASE ]; then - rm -f $image_dir/disk -fi - -# Get the base image if it does not yet exist -if [ ! -e $image_dir/disk ]; then - $TOOLS_DIR/get_uec_image.sh -r $GUEST_SIZE $DIST_NAME $image_dir/disk $image_dir/kernel -fi - -# Copy over dev environment if COPY_ENV is set. -# This will also copy over your current devstack. -if [ $COPY_ENV ]; then - cd $TOOLS_DIR - ./copy_dev_environment_to_uec.sh $image_dir/disk -fi - -# Option to warm the base image with software requirements. -if [ $WARM_CACHE ]; then - cd $TOOLS_DIR - ./warm_apts_for_uec.sh $image_dir/disk -fi - -# Name of our instance, used by libvirt -GUEST_NAME=${GUEST_NAME:-devstack} - -# Mop up after previous runs -virsh destroy $GUEST_NAME || true - -# Where this vm is stored -vm_dir=$WORK_DIR/instances/$GUEST_NAME - -# Create vm dir and remove old disk -mkdir -p $vm_dir -rm -f $vm_dir/disk - -# Create a copy of the base image -qemu-img create -f qcow2 -b $image_dir/disk $vm_dir/disk - -# Back to devstack -cd $TOP_DIR - -GUEST_NETWORK=${GUEST_NETWORK:-1} -GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes} -GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50} -GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24} -GUEST_NETMASK=${GUEST_NETMASK:-255.255.255.0} -GUEST_GATEWAY=${GUEST_GATEWAY:-192.168.$GUEST_NETWORK.1} -GUEST_MAC=${GUEST_MAC:-"02:16:3e:07:69:`printf '%02X' $GUEST_NETWORK`"} -GUEST_RAM=${GUEST_RAM:-1524288} -GUEST_CORES=${GUEST_CORES:-1} - -# libvirt.xml configuration -NET_XML=$vm_dir/net.xml -NET_NAME=${NET_NAME:-devstack-$GUEST_NETWORK} -cat > $NET_XML < - $NET_NAME - - - - - - - - -EOF - -if [[ "$GUEST_RECREATE_NET" == "yes" ]]; then - virsh net-destroy $NET_NAME || true - # destroying the network isn't enough to delete the leases - rm -f /var/lib/libvirt/dnsmasq/$NET_NAME.leases - virsh net-create $vm_dir/net.xml -fi - -# libvirt.xml configuration -LIBVIRT_XML=$vm_dir/libvirt.xml -cat > $LIBVIRT_XML < - $GUEST_NAME - $GUEST_RAM - - hvm - $image_dir/kernel - root=/dev/vda ro console=ttyS0 init=/usr/lib/cloud-init/uncloud-init ds=nocloud-net;s=http://192.168.$GUEST_NETWORK.1:4567/ ubuntu-pass=ubuntu - - - - - - $GUEST_CORES - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -EOF - - -rm -rf $vm_dir/uec -cp -r $TOOLS_DIR/uec $vm_dir/uec - -# set metadata -cat > $vm_dir/uec/meta-data< $vm_dir/uec/user-data<> $vm_dir/uec/user-data< localrc < /opt/stack/.ssh/authorized_keys -chown -R $STACK_USER /opt/stack -chmod 700 /opt/stack/.ssh -chmod 600 /opt/stack/.ssh/authorized_keys - -grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers || - echo "#includedir /etc/sudoers.d" >> /etc/sudoers -( umask 226 && echo "stack ALL=(ALL) NOPASSWD:ALL" \ - > /etc/sudoers.d/50_stack_sh ) -EOF -fi - -# Run stack.sh -cat >> $vm_dir/uec/user-data<