deleted file mode 100644

@@ -1,219 +0,0 @@

-# based on debootstrap/scripts/natty

-

-case $ARCH in

-  amd64|i386)

-	default_mirror http://archive.ubuntu.com/ubuntu

-	;;

-  sparc)

-	case $SUITE in

-	  gutsy)

-	default_mirror http://archive.ubuntu.com/ubuntu

-	;;

-	  *)

-	default_mirror http://ports.ubuntu.com/ubuntu-ports

-	;;

-	esac

-	;;

-  *)

-	default_mirror http://ports.ubuntu.com/ubuntu-ports

-	;;

-esac

-mirror_style release

-download_style apt

-finddebs_style from-indices

-variants - buildd fakechroot minbase

-

-if doing_variant fakechroot; then

-	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"

-fi

-

-case $ARCH in

-	alpha|ia64) LIBC="libc6.1" ;;

-	*)          LIBC="libc6" ;;

-esac

-

-work_out_debs () {

-	required="$(get_debs Priority: required) openssh-server"

-

-	if doing_variant -; then

-		#required="$required $(get_debs Priority: important)"

-		#  ^^ should be getting debconf here somehow maybe

-		base="$(get_debs Priority: important)"

-	elif doing_variant buildd; then

-		base="$(get_debs Build-Essential: yes)"

-	elif doing_variant fakechroot || doing_variant minbase; then

-		base="apt"

-	fi

-}

-

-first_stage_install () {

-	extract $required

-

-	mkdir -p "$TARGET/var/lib/dpkg"

-	: >"$TARGET/var/lib/dpkg/status"

-	: >"$TARGET/var/lib/dpkg/available"

-

-	setup_etc

-	if [ ! -e "$TARGET/etc/fstab" ]; then

-		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"

-		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"

-	fi

-

-	if doing_variant fakechroot; then

-		setup_devices_fakechroot

-	else

-		setup_devices

-	fi

-

-	x_feign_install () {

-		local pkg="$1"

-		local deb="$(debfor $pkg)"

-		local ver="$(extract_deb_field "$TARGET/$deb" Version)"

-

-		mkdir -p "$TARGET/var/lib/dpkg/info"

-

-		echo \

-"Package: $pkg

-Version: $ver

-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"

-

-		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"

-	}

-

-	x_feign_install dpkg

-}

-

-second_stage_install () {

-	x_core_install () {

-		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")

-	}

-

-	p () {

-		baseprog="$(($baseprog + ${1:-1}))"

-	}

-

-	if doing_variant fakechroot; then

-		setup_proc_fakechroot

-	else

-		setup_proc

-		in_target /sbin/ldconfig

-	fi

-

-	DEBIAN_FRONTEND=noninteractive

-	DEBCONF_NONINTERACTIVE_SEEN=true

-	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN

-

-	baseprog=0

-	bases=7

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #1

-	info INSTCORE "Installing core packages..."

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #2

-	ln -sf mawk "$TARGET/usr/bin/awk"

-	x_core_install base-files base-passwd

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #3

-	x_core_install dpkg

-

-	if [ ! -e "$TARGET/etc/localtime" ]; then

-		ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"

-	fi

-

-	if doing_variant fakechroot; then

-		install_fakechroot_tools

-	fi

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #4

-	x_core_install $LIBC

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #5

-	x_core_install perl-base

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #6

-	rm "$TARGET/usr/bin/awk"

-	x_core_install mawk

-

-	p; progress $baseprog $bases INSTCORE "Installing core packages" #7

-	if doing_variant -; then

-		x_core_install debconf

-	fi

-

-	baseprog=0

-	bases=$(set -- $required; echo $#)

-

-	info UNPACKREQ "Unpacking required packages..."

-

-	smallyes '' |

-		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \

-		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |

-		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1

-

-	info CONFREQ "Configuring required packages..."

-

-	if doing_variant fakechroot; then

-	# fix initscripts postinst (no mounting possible, and wrong if condition)

-	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"

-	fi

-

-	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"

-	echo \

-"#!/bin/sh

-echo

-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"

-	chmod 755 "$TARGET/sbin/start-stop-daemon"

-

-	if [ -x "$TARGET/sbin/initctl" ]; then

-	  mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"

-	  echo \

-"#!/bin/sh

-echo

-echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"

-	  chmod 755 "$TARGET/sbin/initctl"

-	fi

-

-	setup_dselect_method apt

-

-	smallyes '' |

-		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \

-		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |

-		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1

-

-	baseprog=0

-	bases="$(set -- $base; echo $#)"

-

-	info UNPACKBASE "Unpacking the base system..."

-

-	setup_available $required $base

-	done_predeps=

-	while predep=$(get_next_predep); do

-		# We have to resolve dependencies of pre-dependencies manually because

-		# dpkg --predep-package doesn't handle this.

-		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")

-		# XXX: progress is tricky due to how dpkg_progress works

-		# -- cjwatson 2009-07-29

-		p; smallyes '' |

-		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)

-		base=$(without "$base" "$predep")

-		done_predeps="$done_predeps $predep"

-	done

-

-	smallyes '' |

-		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \

-		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |

-		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1

-

-	info CONFBASE "Configuring the base system..."

-

-	smallyes '' |

-		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \

-		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |

-		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1

-

-	if [ -x "$TARGET/sbin/initctl.REAL" ]; then

-		mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"

-	fi

-	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"

-

-	progress $bases $bases CONFBASE "Configuring base system"

-	info BASESUCCESS "Base system installed successfully."

-}

@@ -53,12 +53,7 @@ function clone_or_up {

 # You should only have to run this once

 if [ "$CMD" == "install" ]; then

-    #apt-get install -y python-software-properties

-    # FIXME: do we still need this?

-    # DELETEME: add-apt-repository ppa:nova-core/trunk

-    # DELETEME: apt-get update -qq

-

-    # fixme: do we need: python-boto

+    # install apt requirements

     apt-get install -y -q `cat $DIR/apts/*`

     # install python requirements

@@ -83,13 +78,12 @@ if [ "$CMD" == "install" ]; then

     cd $API_DIR; python setup.py develop

     cd $DASH_DIR/django-openstack; python setup.py develop

     cd $DASH_DIR/openstack-dashboard; python setup.py develop

-    # dash currently imports quantum even if you aren't using it

+    # HACK: dash currently imports quantum even if you aren't using it

     cd $DASH_DIR/openstack-dashboard

     mkdir quantum

     touch quantum/__init__.py

     touch quantum/client.py

-

     # attempt to load kvm and nbd modules

     modprobe kvm || true

     modprobe nbd || true

@@ -98,26 +92,13 @@ if [ "$CMD" == "install" ]; then

     # install dashboard

     cd $DASH_DIR/openstack-dashboard

     cp local/local_settings.py.example local/local_settings.py

-#    python tools/install_venv.py

     dashboard/manage.py syncdb

     # setup apache

     mkdir $DASH_DIR/.blackhole

-#    cat > $DASH_DIR/openstack-dashboard/dashboard/wsgi/local.wsgi <<EOF

-#import sys

-#sys.path.append('/$DASH_DIR/openstack-dashboard/.dashboard-venv/lib/python2.6/site-packages/')

-#sys.path.append('/$DASH_DIR/openstack-dashboard/.dashboard-venv/lib/python2.7/site-packages/')

-#sys.path.append('/$DASH_DIR/openstack-dashboard/')

-#sys.path.append('/$DASH_DIR/django-openstack/')

-#sys.path.append('/$API_DIR')

-#sys.path.append('/$DASH_DIR/openstack-dashboard/.dashboard-venv/src/openstack')

-#

-#EOF

-    cat $DASH_DIR/openstack-dashboard/dashboard/wsgi/django.wsgi >> $DASH_DIR/openstack-dashboard/dashboard/wsgi/local.wsgi

-

     cat > /etc/apache2/sites-enabled/000-default <<EOF

 <VirtualHost *:80>

-    WSGIScriptAlias / $DASH_DIR/openstack-dashboard/dashboard/wsgi/local.wsgi

+    WSGIScriptAlias / $DASH_DIR/openstack-dashboard/dashboard/wsgi/django.wsgi

     WSGIDaemonProcess dashboard user=www-data group=www-data processes=3 threads=10

     WSGIProcessGroup dashboard

@@ -234,9 +215,8 @@ if [ "$CMD" == "run" ] || [ "$CMD" == "run_detached" ]; then

     screen_it net "$NOVA_DIR/bin/nova-network"

     screen_it sched "$NOVA_DIR/bin/nova-scheduler"

     screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_DIR/etc/keystone.conf"

-    screen_it dash "/etc/init.d/apache2 restart; tail -f /var/log/apache2/error.log"

     screen_it vnc "$NOVA_DIR/bin/nova-vncproxy"

-    screen_it test ""

+    screen_it dash "/etc/init.d/apache2 restart; tail -f /var/log/apache2/error.log"

     # FIXME: switch to just importing images

     # remove previously converted images