deleted file mode 100644

@@ -1,42 +0,0 @@

-Tool to quickly deploy openstack dev environments.

-

-# Goals

-

-* To quickly build dev openstack environments in clean natty environments

-* To describe working configurations of openstack (which code branches work together?  what do config files look like for those branches?)

-* To make it easier for developers to dive into openstack so that they can productively contribute without having to understand every part of the system at once

-* To make it easy to prototype cross-project features

-

-Be sure to carefully read these scripts before you run them as they install software and may alter your networking configuration.

-

-# To start a dev cloud on your local machine (installing on a dedicated vm is safer!):

-

-    ./stack.sh

-

-If working correctly, you should be able to access openstack endpoints, like:

-

-* Dashboard: http://myhost/

-* Keystone: http://myhost:5000/v2.0/

-

-# To start a dev cloud in an lxc container:

-

-    ./build_lxc.sh

-

-You will need to configure a bridge and network on your host machine (by default br0) before starting build_lxc.sh.  A sample host-only network configuration can be found in lxc_network_hostonlyplusnat.sh.

-

-# Customizing

-

-You can tweak environment variables by creating file name 'localrc' should you need to override defaults.  It is likely that you will need to do this to tweak your networking configuration should you need to access your cloud from a different host.

-

-# Todo

-

-* Add python-novaclient cli support

-* syslog

-* allow rabbit connection to be specified via environment variables with sensible defaults

-* Add volume support

-* Add quantum support

-

-# Future

-

-* idea: move from screen to tmux?

-* idea: create a live-cd / vmware preview image using this?

new file mode 100644

@@ -0,0 +1,43 @@

+Tool to quickly deploy openstack dev environments.

+

+# Goals

+

+* To quickly build dev openstack environments in clean natty environments

+* To describe working configurations of openstack (which code branches work together?  what do config files look like for those branches?)

+* To make it easier for developers to dive into openstack so that they can productively contribute without having to understand every part of the system at once

+* To make it easy to prototype cross-project features

+

+Read more at http://devstack.org (built from the gh-pages branch)

+

+Be sure to carefully read these scripts before you run them as they install software and may alter your networking configuration.

+

+# To start a dev cloud on your local machine (installing on a dedicated vm is safer!):

+

+    ./stack.sh

+

+If working correctly, you should be able to access openstack endpoints, like:

+

+* Dashboard: http://myhost/

+* Keystone: http://myhost:5000/v2.0/

+

+# To start a dev cloud in an lxc container:

+

+    ./build_lxc.sh

+

+You will need to configure a bridge and network on your host machine (by default br0) before starting build_lxc.sh.  A sample host-only network configuration can be found in lxc_network_hostonlyplusnat.sh.

+

+# Customizing

+

+You can tweak environment variables by creating file name 'localrc' should you need to override defaults.  It is likely that you will need to do this to tweak your networking configuration should you need to access your cloud from a different host.

+

+# Todo

+

+* Add python-novaclient cli support

+* syslog

+* Add volume support

+* Add quantum support

+

+# Future

+

+* idea: move from screen to tmux?

+* idea: create a live-cd / vmware preview image using this?

deleted file mode 100755

@@ -1,117 +0,0 @@

-#!/bin/bash

-

-PROGDIR=`dirname $0`

-CHROOTCACHE=${CHROOTCACHE:-/var/cache/devstack}

-

-# Source params

-source ./stackrc

-

-# Store cwd

-CWD=`pwd`

-

-NAME=$1

-NFSDIR="/nfs/$NAME"

-DEST=${DEST:-/opt/stack}

-

-# Option to use the version of devstack on which we are currently working

-USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}

-

-# remove old nfs filesystem if one exists

-rm -rf $DEST

-

-# clean install of natty

-if [ ! -d $CHROOTCACHE/natty-base ]; then

-    $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base

-    # copy kernel modules...  

-    # NOTE(ja): is there a better way to do this?

-    cp -pr /lib/modules/`uname -r` $CHROOTCACHE/natty-base/lib/modules

-    # a simple password - pass

-    echo root:pass | chroot $CHROOTCACHE/natty-base chpasswd

-fi

-

-# prime natty with as many apt/pips as we can

-if [ ! -d $CHROOTCACHE/natty-dev ]; then

-    rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/

-    chroot $CHROOTCACHE/natty-dev apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

-    chroot $CHROOTCACHE/natty-dev pip install `cat files/pips/*`

-

-    # Create a stack user that is a member of the libvirtd group so that stack 

-    # is able to interact with libvirt.

-    chroot $CHROOTCACHE/natty-dev groupadd libvirtd

-    chroot $CHROOTCACHE/natty-dev useradd stack -s /bin/bash -d $DEST -G libvirtd

-    mkdir -p $CHROOTCACHE/natty-dev/$DEST

-    chown stack $CHROOTCACHE/natty-dev/$DEST

-

-    # a simple password - pass

-    echo stack:pass | chroot $CHROOTCACHE/natty-dev chpasswd

-

-    # and has sudo ability (in the future this should be limited to only what 

-    # stack requires)

-    echo "stack ALL=(ALL) NOPASSWD: ALL" >> $CHROOTCACHE/natty-dev/etc/sudoers

-fi

-

-# clone git repositories onto the system

-# ======================================

-

-if [ ! -d $CHROOTCACHE/natty-stack ]; then

-    rsync -azH $CHROOTCACHE/natty-dev/ $CHROOTCACHE/natty-stack/

-fi

-

-# git clone only if directory doesn't exist already.  Since ``DEST`` might not

-# be owned by the installation user, we create the directory and change the

-# ownership to the proper user.

-function git_clone {

-

-    # clone new copy or fetch latest changes

-    CHECKOUT=$CHROOTCACHE/natty-stack$2

-    if [ ! -d $CHECKOUT ]; then

-        mkdir -p $CHECKOUT

-        git clone $1 $CHECKOUT

-    else

-        pushd $CHECKOUT

-        git fetch

-        popd

-    fi

-

-    # FIXME(ja): checkout specified version (should works for branches and tags)

-

-    pushd $CHECKOUT

-    # checkout the proper branch/tag

-    git checkout $3

-    # force our local version to be the same as the remote version

-    git reset --hard origin/$3

-    popd

-

-    # give ownership to the stack user

-    chroot $CHROOTCACHE/natty-stack/ chown -R stack $2

-}

-

-git_clone $NOVA_REPO $DEST/nova $NOVA_BRANCH

-git_clone $GLANCE_REPO $DEST/glance $GLANCE_BRANCH

-git_clone $KEYSTONE_REPO $DEST/keystone $KEYSTONE_BRANCH

-git_clone $NOVNC_REPO $DEST/novnc $NOVNC_BRANCH

-git_clone $DASH_REPO $DEST/dash $DASH_BRANCH $DASH_TAG

-git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH

-git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH

-

-chroot $CHROOTCACHE/natty-stack mkdir -p $DEST/files

-wget -c http://images.ansolabs.com/tty.tgz -O $CHROOTCACHE/natty-stack$DEST/files/tty.tgz

-

-# Use this version of devstack?

-if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then

-    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack

-    cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack

-fi

-

-cp -pr $CHROOTCACHE/natty-stack $NFSDIR

-

-# set hostname

-echo $NAME > $NFSDIR/etc/hostname

-echo "127.0.0.1 localhost $NAME" > $NFSDIR/etc/hosts

-

-# injecting root's public ssh key if it exists

-if [ -f /root/.ssh/id_rsa.pub ]; then

-    mkdir $NFSDIR/root/.ssh

-    chmod 700 $NFSDIR/root/.ssh

-    cp /root/.ssh/id_rsa.pub $NFSDIR/root/.ssh/authorized_keys

-fi

deleted file mode 100755

@@ -1,116 +0,0 @@

-#!/bin/bash -e

-# build_pxe_boot.sh - Create a PXE boot environment

-#

-# build_pxe_boot.sh [-k kernel-version] destdir

-#

-# Assumes syslinux is installed

-# Assumes devstack files are in `pwd`/pxe

-# Only needs to run as root if the destdir permissions require it

-

-UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/dists/natty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64

-

-MEMTEST_VER=4.10

-MEMTEST_BIN=memtest86+-${MEMTEST_VER}.bin

-MEMTEST_URL=http://www.memtest.org/download/${MEMTEST_VER}/

-

-KVER=`uname -r`

-if [ "$1" = "-k" ]; then

-    KVER=$2

-    shift;shift

-fi

-

-DEST_DIR=${1:-/tmp}/tftpboot

-PXEDIR=${PXEDIR:-/var/cache/devstack/pxe}

-OPWD=`pwd`

-PROGDIR=`dirname $0`

-

-mkdir -p $DEST_DIR/pxelinux.cfg

-cd $DEST_DIR

-for i in memdisk menu.c32 pxelinux.0; do

-	cp -p /usr/lib/syslinux/$i $DEST_DIR

-done

-

-DEFAULT=$DEST_DIR/pxelinux.cfg/default

-cat >$DEFAULT <<EOF

-default menu.c32

-prompt 0

-timeout 0

-

-MENU TITLE PXE Boot Menu

-

-EOF

-

-# Setup devstack boot

-mkdir -p $DEST_DIR/ubuntu

-if [ ! -d $PXEDIR ]; then

-    mkdir -p $PXEDIR

-fi

-if [ ! -r $PXEDIR/vmlinuz-${KVER} ]; then

-    sudo chmod 644 /boot/vmlinuz-${KVER}

-    if [ ! -r /boot/vmlinuz-${KVER} ]; then

-        echo "No kernel found"

-    else

-        cp -p /boot/vmlinuz-${KVER} $PXEDIR

-    fi

-fi

-cp -p $PXEDIR/vmlinuz-${KVER} $DEST_DIR/ubuntu

-if [ ! -r $PXEDIR/stack-initrd.gz ]; then

-    cd $OPWD

-    sudo $PROGDIR/build_pxe_ramdisk.sh $PXEDIR/stack-initrd.gz

-fi

-cp -p $PXEDIR/stack-initrd.gz $DEST_DIR/ubuntu

-cat >>$DEFAULT <<EOF

-

-LABEL devstack

-    MENU LABEL ^devstack

-    MENU DEFAULT

-    KERNEL ubuntu/vmlinuz-$KVER

-    APPEND initrd=ubuntu/stack-initrd.gz ramdisk_size=2109600 root=/dev/ram0

-EOF

-

-# Get Ubuntu

-if [ -d $PXEDIR ]; then

-    cp -p $PXEDIR/natty-base-initrd.gz $DEST_DIR/ubuntu

-fi

-cat >>$DEFAULT <<EOF

-

-LABEL ubuntu

-    MENU LABEL ^Ubuntu Natty

-    KERNEL ubuntu/vmlinuz-$KVER

-    APPEND initrd=ubuntu/natty-base-initrd.gz ramdisk_size=419600 root=/dev/ram0

-EOF

-

-# Get Memtest

-cd $DEST_DIR

-if [ ! -r $MEMTEST_BIN ]; then

-    wget -N --quiet ${MEMTEST_URL}/${MEMTEST_BIN}.gz

-    gunzip $MEMTEST_BIN

-fi

-cat >>$DEFAULT <<EOF

-

-LABEL memtest

-    MENU LABEL ^Memtest86+

-    KERNEL $MEMTEST_BIN

-EOF

-

-# Get FreeDOS

-mkdir -p $DEST_DIR/freedos

-cd $DEST_DIR/freedos

-wget -N --quiet http://www.fdos.org/bootdisks/autogen/FDSTD.288.gz

-gunzip -f FDSTD.288.gz

-cat >>$DEFAULT <<EOF

-

-LABEL freedos

-	MENU LABEL ^FreeDOS bootdisk

-	KERNEL memdisk

-	APPEND initrd=freedos/FDSTD.288

-EOF

-

-# Local disk boot

-cat >>$DEFAULT <<EOF

-

-LABEL local

-    MENU LABEL ^Local disk

-    MENU DEFAULT

-    LOCALBOOT 0

-EOF

deleted file mode 100755

@@ -1,135 +0,0 @@

-#!/bin/bash

-

-if [ ! "$#" -eq "1" ]; then

-    echo "$0 builds a gziped natty openstack install"

-    echo "usage: $0 dest"

-    exit 1

-fi

-

-PROGDIR=`dirname $0`

-CHROOTCACHE=${CHROOTCACHE:-/var/cache/devstack}

-

-# Source params

-source ./stackrc

-

-# Store cwd

-CWD=`pwd`

-

-DEST=${DEST:-/opt/stack}

-

-# Option to use the version of devstack on which we are currently working

-USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}

-

-# clean install of natty

-if [ ! -d $CHROOTCACHE/natty-base ]; then

-    $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base

-    # copy kernel modules...  

-    # NOTE(ja): is there a better way to do this?

-    cp -pr /lib/modules/`uname -r` $CHROOTCACHE/natty-base/lib/modules

-    # a simple password - pass

-    echo root:pass | chroot $CHROOTCACHE/natty-base chpasswd

-fi

-

-# prime natty with as many apt/pips as we can

-if [ ! -d $CHROOTCACHE/natty-dev ]; then

-    rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/

-    chroot $CHROOTCACHE/natty-dev apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

-    chroot $CHROOTCACHE/natty-dev pip install `cat files/pips/*`

-

-    # Create a stack user that is a member of the libvirtd group so that stack 

-    # is able to interact with libvirt.

-    chroot $CHROOTCACHE/natty-dev groupadd libvirtd

-    chroot $CHROOTCACHE/natty-dev useradd stack -s /bin/bash -d $DEST -G libvirtd

-    mkdir -p $CHROOTCACHE/natty-dev/$DEST

-    chown stack $CHROOTCACHE/natty-dev/$DEST

-

-    # a simple password - pass

-    echo stack:pass | chroot $CHROOTCACHE/natty-dev chpasswd

-

-    # and has sudo ability (in the future this should be limited to only what 

-    # stack requires)

-    echo "stack ALL=(ALL) NOPASSWD: ALL" >> $CHROOTCACHE/natty-dev/etc/sudoers

-fi

-

-# clone git repositories onto the system

-# ======================================

-

-if [ ! -d $CHROOTCACHE/natty-stack ]; then

-    rsync -azH $CHROOTCACHE/natty-dev/ $CHROOTCACHE/natty-stack/

-fi

-

-# git clone only if directory doesn't exist already.  Since ``DEST`` might not

-# be owned by the installation user, we create the directory and change the

-# ownership to the proper user.

-function git_clone {

-

-    # clone new copy or fetch latest changes

-    CHECKOUT=$CHROOTCACHE/natty-stack$2

-    if [ ! -d $CHECKOUT ]; then

-        mkdir -p $CHECKOUT

-        git clone $1 $CHECKOUT

-    else

-        pushd $CHECKOUT

-        git fetch

-        popd

-    fi

-

-    # FIXME(ja): checkout specified version (should works for branches and tags)

-

-    pushd $CHECKOUT

-    # checkout the proper branch/tag

-    git checkout $3

-    # force our local version to be the same as the remote version

-    git reset --hard origin/$3

-    popd

-

-    # give ownership to the stack user

-    chroot $CHROOTCACHE/natty-stack/ chown -R stack $2

-}

-

-git_clone $NOVA_REPO $DEST/nova $NOVA_BRANCH

-git_clone $GLANCE_REPO $DEST/glance $GLANCE_BRANCH

-git_clone $KEYSTONE_REPO $DEST/keystone $KEYSTONE_BRANCH

-git_clone $NOVNC_REPO $DEST/novnc $NOVNC_BRANCH

-git_clone $DASH_REPO $DEST/dash $DASH_BRANCH

-git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH

-git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH

-

-# Use this version of devstack?

-if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then

-    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack

-    cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack

-fi

-

-# Configure host network for DHCP

-mkdir -p $CHROOTCACHE/natty-stack/etc/network

-cat > $CHROOTCACHE/natty-stack/etc/network/interfaces <<EOF

-auto lo

-iface lo inet loopback

-

-auto eth0

-iface eth0 inet dhcp

-EOF

-

-# build a new image

-BASE=$CHROOTCACHE/build.$$

-IMG=$BASE.img

-MNT=$BASE/

-

-# (quickly) create a 2GB blank filesystem

-dd bs=1 count=1 seek=$((2*1024*1024*1024)) if=/dev/zero of=$IMG

-# force it to be initialized as ext2

-mkfs.ext2 -F $IMG

-

-# mount blank image loopback and load it

-mkdir -p $MNT

-mount -o loop $IMG $MNT

-rsync -azH $CHROOTCACHE/natty-stack/ $MNT

-

-# umount and cleanup

-umount $MNT

-rmdir $MNT

-

-# gzip into final location

-gzip -1 $IMG -c > $1

-

deleted file mode 100755

@@ -1,178 +0,0 @@

-#!/bin/bash

-# make_image.sh - Create Ubuntu images in various formats

-#

-# Supported formats: qcow (kvm), vmdk (vmserver), vdi (vbox), vhd (vpc), raw

-#

-# Requires sudo to root

-

-ROOTSIZE=${ROOTSIZE:-8192}

-SWAPSIZE=${SWAPSIZE:-1024}

-MIN_PKGS=${MIN_PKGS:-"apt-utils gpgv openssh-server"}

-

-usage() {

-    echo "Usage: $0 - Create Ubuntu images"

-    echo ""

-    echo "$0 [-m] [-r rootsize] [-s swapsize] release format"

-    echo "$0 -C [-m] release chrootdir"

-    echo "$0 -I [-r rootsize] [-s swapsize] chrootdir format"

-    echo ""

-    echo "-C        - Create the initial chroot dir"

-    echo "-I        - Create the final image from a chroot"

-    echo "-m        - minimal installation"

-    echo "-r size   - root fs size in MB"

-    echo "-s size   - swap fs size in MB"

-    echo "release   - Ubuntu release: jaunty - oneric"

-    echo "format    - image format: qcow2, vmdk, vdi, vhd, xen, raw, fs"

-    exit 1

-}

-

-while getopts CIhmr:s: c; do

-    case $c in

-        C)  CHROOTONLY=1

-            ;;

-        I)  IMAGEONLY=1

-            ;;

-        h)  usage

-            ;;

-        m)  MINIMAL=1

-            ;;

-        r)  ROOTSIZE=$OPTARG

-            ;;

-        s)  SWAPSIZE=$OPTARG

-            ;;

-    esac

-done

-shift `expr $OPTIND - 1`

-

-if [ ! "$#" -eq "2" -o -n "$CHROOTONLY" -a -n "$IMAGEONLY" ]; then

-    usage

-fi

-

-# Default args

-RELEASE=$1

-FORMAT=$2

-CHROOTDIR=""

-

-if [ -n "$CHROOTONLY" ]; then

-    RELEASE=$1

-    CHROOTDIR=$2

-    FORMAT="pass"

-fi

-

-if [ -n "$IMAGEONLY" ]; then

-    CHROOTDIR=$1

-    FORMAT=$2

-    RELEASE="pass"

-fi

-

-case $FORMAT in

-    kvm|qcow2)  FORMAT=qcow2

-                QFORMAT=qcow2

-                HYPER=kvm

-                ;;

-    vmserver|vmdk)

-                FORMAT=vmdk

-                QFORMAT=vmdk

-                HYPER=vmserver

-                ;;

-    vbox|vdi)   FORMAT=vdi

-                QFORMAT=vdi

-                HYPER=kvm

-                ;;

-    vhd|vpc)    FORMAT=vhd

-                QFORMAT=vpc

-                HYPER=kvm

-                ;;

-    xen)        FORMAT=raw

-                QFORMAT=raw

-                HYPER=xen

-                ;;

-    raw)        FORMAT=raw

-                QFORMAT=raw

-                HYPER=kvm

-                ;;

-    pass)       ;;

-    *)          echo "Unknown format: $FORMAT"

-                usage

-esac

-

-case $RELEASE in

-    natty)      ;;

-    maverick)   ;;

-    lucid)      ;;

-    karmic)     ;;

-    jaunty)     ;;

-    pass)       ;;

-    *)          echo "Unknown release: $RELEASE"

-                usage

-                ;;

-esac

-

-# Install stuff if necessary

-if [ -z `which vmbuilder` ]; then

-    sudo apt-get install ubuntu-vm-builder

-fi

-

-if [ -n "$CHROOTONLY" ]; then

-    # Build a chroot directory

-    HYPER=kvm

-    if [ "$MINIMAL" = 1 ]; then

-        ARGS="--variant=minbase"

-        for i in $MIN_PKGS; do

-            ARGS="$ARGS --addpkg=$i"

-        done

-    fi

-    sudo vmbuilder $HYPER ubuntu $ARGS \

-      --suite $RELEASE \

-      --only-chroot \

-      --chroot-dir=$CHROOTDIR \

-      --overwrite \

-      --addpkg=$MIN_PKGS \

-

-    sudo cp -p files/sources.list $CHROOTDIR/etc/apt/sources.list

-    sudo chroot $CHROOTDIR apt-get update

-

-    exit 0

-fi

-

-# Build the image

-TMPDIR=tmp

-TMPDISK=`mktemp imgXXXXXXXX`

-SIZE=$[$ROOTSIZE+$SWAPSIZE+1]

-dd if=/dev/null of=$TMPDISK bs=1M seek=$SIZE count=1

-

-if [ -n "$IMAGEONLY" ]; then

-    # Build image from chroot

-    sudo vmbuilder $HYPER ubuntu $ARGS \

-      --existing-chroot=$CHROOTDIR \

-      --overwrite \

-      --rootsize=$ROOTSIZE \

-      --swapsize=$SWAPSIZE \

-      --tmpfs - \

-      --raw=$TMPDISK \

-

-else

-    # Do the whole shebang in one pass

-        ARGS="--variant=minbase"

-        for i in $MIN_PKGS; do

-            ARGS="$ARGS --addpkg=$i"

-        done

-    sudo vmbuilder $HYPER ubuntu $ARGS \

-      --suite $RELEASE \

-      --overwrite \

-      --rootsize=$ROOTSIZE \

-      --swapsize=$SWAPSIZE \

-      --tmpfs - \

-      --raw=$TMPDISK \

-

-fi

-

-if [ "$FORMAT" = "raw" ]; then

-    # Get image

-    mv $TMPDISK $RELEASE.$FORMAT

-else

-    # Convert image

-    qemu-img convert -O $QFORMAT $TMPDISK $RELEASE.$FORMAT

-    rm $TMPDISK

-fi

-rm -rf ubuntu-$HYPER

@@ -20,9 +20,6 @@

 # Sanity Check

 # ============

-# Record the start time.  This allows us to print how long this script takes to run.

-START_TIME=`python -c "import time; print time.time()"`

-

 # Warn users who aren't on natty, but allow them to override check and attempt

 # installation with ``FORCE=yes ./stack``

 if ! grep -q natty /etc/lsb-release; then

@@ -53,40 +50,38 @@ TOP_DIR=$(cd $(dirname "$0") && pwd)

 if [[ $EUID -eq 0 ]]; then

     echo "You are running this script as root."

+    echo "In 10 seconds, we will create a user 'stack' and run as that user"

+    sleep 10 

     # since this script runs as a normal user, we need to give that user

     # ability to run sudo

     apt-get update

-    apt-get install -qqy sudo

+    apt-get install -y sudo

-    if ! getent passwd | grep -q stack; then

+    if ! getent passwd stack >/dev/null; then

         echo "Creating a user called stack"

         useradd -U -G sudo -s /bin/bash -m stack

     fi

+

     echo "Giving stack user passwordless sudo priviledges"

-    echo "stack ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

+    # natty uec images sudoers does not have a '#includedir'. add one.

+    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 )

     echo "Copying files to stack user"

-    cp -r -f `pwd` /home/stack/

-    THIS_DIR=$(basename $(dirname $(readlink -f $0)))

-    chown -R stack /home/stack/$THIS_DIR

-    echo "Running the script as stack in 3 seconds..."

-    sleep 3

+    STACK_DIR="/home/stack/${PWD##*/}"

+    cp -r -f "$PWD" "$STACK_DIR"

+    chown -R stack "$STACK_DIR"

     if [[ "$SHELL_AFTER_RUN" != "no" ]]; then

-	exec su -c "cd /home/stack/$THIS_DIR/; bash stack.sh; bash" stack

+        exec su -c "set -e; cd $STACK_DIR; bash stack.sh; bash" stack

     else

-	exec su -c "cd /home/stack/$THIS_DIR/; bash stack.sh" stack

+        exec su -c "set -e; cd $STACK_DIR; bash stack.sh" stack

     fi

-    exit 0

+    exit 1

 fi

-# So that errors don't compound we exit on any errors so you see only the

-# first error that occured.

-set -o errexit

-

-# Print the commands being run so that we can see the command that triggers

-# an error.  It is also useful for following allowing as the install occurs.

-set -o xtrace

 # Settings

 # ========

@@ -120,8 +115,6 @@ source ./stackrc

 # Destination path for installation ``DEST``

 DEST=${DEST:-/opt/stack}

-sudo mkdir -p $DEST

-sudo chown `whoami` $DEST

 # Set the destination directories for openstack projects

 NOVA_DIR=$DEST/nova

@@ -261,6 +254,24 @@ read_password SERVICE_TOKEN "ENTER A SERVICE_TOKEN TO USE FOR THE SERVICE ADMIN

 # Dash currently truncates usernames and passwords at 20 characters

 read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR DASH AND KEYSTONE (20 CHARS OR LESS)."

+LOGFILE=${LOGFILE:-"$PWD/stack.sh.$$.log"}

+(

+# So that errors don't compound we exit on any errors so you see only the

+# first error that occured.

+trap failed ERR

+failed() {

+    local r=$?

+    set +o xtrace

+    [ -n "$LOGFILE" ] && echo "${0##*/} failed: full log in $LOGFILE"

+    exit $r

+}

+

+# Print the commands being run so that we can see the command that triggers

+# an error.  It is also useful for following along as the install occurs.

+set -o xtrace

+

+sudo mkdir -p $DEST

+sudo chown `whoami` $DEST

 # Install Packages

 # ================

@@ -269,6 +280,7 @@ read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR DASH AND KEYSTONE (20

 # install apt requirements

+sudo apt-get update

 sudo apt-get install -qqy `cat $FILES/apts/* | cut -d\# -f1 | grep -Ev "mysql-server|rabbitmq-server"`

 # install python requirements

@@ -347,6 +359,19 @@ mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASSWORD

 mysql-server-5.1 mysql-server/start_on_boot boolean true

 MYSQL_PRESEED

+    # while ``.my.cnf`` is not needed for openstack to function, it is useful

+    # as it allows you to access the mysql databases via ``mysql nova`` instead

+    # of having to specify the username/password each time.

+    if [[ ! -e $HOME/.my.cnf ]]; then

+        cat <<EOF >$HOME/.my.cnf

+[client]

+user=$MYSQL_USER

+password=$MYSQL_PASS    

+host=$MYSQL_HOST

+EOF

+        chmod 0600 $HOME/.my.cnf

+    fi

+

     # Install and start mysql-server

     sudo apt-get -y -q install mysql-server

     # Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:

@@ -625,9 +650,8 @@ fi

 # have to do a little more than that in our script.  Since we add the group

 # ``libvirtd`` to our user in this script, when nova-compute is run it is

 # within the context of our original shell (so our groups won't be updated).

-# We can send the command nova-compute to the ``newgrp`` command to execute

-# in a specific context.

-screen_it n-cpu "cd $NOVA_DIR && echo $NOVA_DIR/bin/nova-compute | newgrp libvirtd"

+# Use 'sg' to execute nova-compute as a member of the libvirtd group.

+screen_it n-cpu "cd $NOVA_DIR && sg libvirtd $NOVA_DIR/bin/nova-compute"

 screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"

 screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"

 screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py 6080 --web . --flagfile=../nova/bin/nova.conf"

@@ -687,6 +711,16 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then

 fi

+# Fin

+# ===

+

+

+) 2>&1 | tee "${LOGFILE}"

+

+# Check that the left side of the above pipe succeeded

+for ret in "${PIPESTATUS[@]}"; do [ $ret -eq 0 ] || exit $ret; done

+

+(

 # Using the cloud

 # ===============

@@ -704,10 +738,7 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then

     echo "the password: $ADMIN_PASSWORD"

 fi

-# Fin

-# ===

+# indicate how long this took to run (bash maintained variable 'SECONDS')

+echo "stack.sh completed in $SECONDS seconds."

-# End our timer and give a timing summary

-END_TIME=`python -c "import time; print time.time()"`

-ELAPSED=`python -c "print $END_TIME - $START_TIME"`

-echo "stack.sh completed in $ELAPSED seconds."

+) | tee -a "$LOGFILE"

new file mode 100755

@@ -0,0 +1,117 @@

+#!/bin/bash

+

+PROGDIR=`dirname $0`

+CHROOTCACHE=${CHROOTCACHE:-/var/cache/devstack}

+

+# Source params

+source ./stackrc

+

+# Store cwd

+CWD=`pwd`

+

+NAME=$1

+NFSDIR="/nfs/$NAME"

+DEST=${DEST:-/opt/stack}

+

+# Option to use the version of devstack on which we are currently working

+USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}

+

+# remove old nfs filesystem if one exists

+rm -rf $DEST

+

+# clean install of natty

+if [ ! -d $CHROOTCACHE/natty-base ]; then

+    $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base

+    # copy kernel modules...  

+    # NOTE(ja): is there a better way to do this?

+    cp -pr /lib/modules/`uname -r` $CHROOTCACHE/natty-base/lib/modules

+    # a simple password - pass

+    echo root:pass | chroot $CHROOTCACHE/natty-base chpasswd

+fi

+

+# prime natty with as many apt/pips as we can

+if [ ! -d $CHROOTCACHE/natty-dev ]; then

+    rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/

+    chroot $CHROOTCACHE/natty-dev apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

+    chroot $CHROOTCACHE/natty-dev pip install `cat files/pips/*`

+

+    # Create a stack user that is a member of the libvirtd group so that stack 

+    # is able to interact with libvirt.

+    chroot $CHROOTCACHE/natty-dev groupadd libvirtd

+    chroot $CHROOTCACHE/natty-dev useradd stack -s /bin/bash -d $DEST -G libvirtd

+    mkdir -p $CHROOTCACHE/natty-dev/$DEST

+    chown stack $CHROOTCACHE/natty-dev/$DEST

+

+    # a simple password - pass

+    echo stack:pass | chroot $CHROOTCACHE/natty-dev chpasswd

+

+    # and has sudo ability (in the future this should be limited to only what 

+    # stack requires)

+    echo "stack ALL=(ALL) NOPASSWD: ALL" >> $CHROOTCACHE/natty-dev/etc/sudoers

+fi

+

+# clone git repositories onto the system

+# ======================================

+

+if [ ! -d $CHROOTCACHE/natty-stack ]; then