@@ -1,59 +1,111 @@

-#!/bin/bash

+#!/usr/bin/env bash

 # Configurable params

 BRIDGE=${BRIDGE:-br0}

-CONTAINER=${CONTAINER:-TESTER}

+CONTAINER=${CONTAINER:-STACK}

 CONTAINER_IP=${CONTAINER_IP:-192.168.1.50}

 CONTAINER_CIDR=${CONTAINER_CIDR:-$CONTAINER_IP/24}

 CONTAINER_NETMASK=${CONTAINER_NETMASK:-255.255.255.0}

 CONTAINER_GATEWAY=${CONTAINER_GATEWAY:-192.168.1.1}

-NAMESERVER=${NAMESERVER:-192.168.1.1}

+NAMESERVER=${NAMESERVER:-$CONTAINER_GATEWAY}

 COPYENV=${COPYENV:-1}

-WARMCACHE=${WARMCACHE:-0}

-# Destroy any existing container

-lxc-stop -n $CONTAINER

-sleep 1

-cgdelete -r cpu,net_cls:$CONTAINER

-sleep 1

-lxc-destroy -n $CONTAINER

-sleep 1

+# Param string to pass to stack.sh.  Like "EC2_DMZ_HOST=192.168.1.1 MYSQL_USER=nova"

+STACKSH_PARAMS=${STACKSH_PARAMS:-}

-CACHEDIR=/var/cache/lxc/natty/rootfs-amd64

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

-    if [ -d $CACHEDIR ]; then

-        # Pre-cache files

-        chroot $CACHEDIR apt-get update

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

-        chroot $CACHEDIR pip install `cat pips/*`

-    fi

+# Warn users who aren't on natty

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

+    echo "WARNING: this script has only been tested on natty"

 fi

-# Create network configuration

-NET_CONF=/tmp/net.conf

-cat > $NET_CONF <<EOF

+# Install deps

+apt-get install lxc debootstrap

+

+# Install cgroup-bin from source, since the packaging is buggy and possibly incompatible with our setup

+if ! which cgdelete | grep -q cgdelete; then

+    apt-get install g++ bison flex libpam0g-dev

+    wget http://sourceforge.net/projects/libcg/files/libcgroup/v0.37.1/libcgroup-0.37.1.tar.bz2/download -O /tmp/libcgroup-0.37.1.tar.bz2 

+    cd /tmp && bunzip2 libcgroup-0.37.1.tar.bz2  && tar xfv libcgroup-0.37.1.tar

+    cd libcgroup-0.37.1

+    ./configure

+    make install

+fi

+

+# Create lxc configuration

+LXC_CONF=/tmp/$CONTAINER.conf

+cat > $LXC_CONF <<EOF

 lxc.network.type = veth

 lxc.network.link = $BRIDGE

 lxc.network.flags = up

 lxc.network.ipv4 = $CONTAINER_CIDR

+# allow tap/tun devices

 lxc.cgroup.devices.allow = c 10:200 rwm

 EOF

-# Configure the network

-lxc-create -n $CONTAINER -t natty -f $NET_CONF

-sleep 2

+# Shutdown any existing container

+lxc-stop -n $CONTAINER

-# Where our container lives

+# This kills zombie containers

+if [ -d /cgroup/$CONTAINER ]; then

+    cgdelete -r cpu,net_cls:$CONTAINER

+fi

+

+# Warm the base image on first install

+CACHEDIR=/var/cache/lxc/natty/rootfs-amd64

+if [  -d $CACHEDIR ]; then

+    # trigger the initial debootstrap

+    lxc-create -n $CONTAINER -t natty -f $LXC_CONF

+    chroot $CACHEDIR apt-get update

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

+    chroot $CACHEDIR pip install `cat pips/*`

+    git clone https://github.com/cloudbuilders/nova.git $CACHEDIR/opt/nova

+    git clone https://github.com/cloudbuilders/openstackx.git $CACHEDIR/opt/openstackx

+    git clone https://github.com/cloudbuilders/noVNC.git $CACHEDIR/opt/noVNC

+    git clone https://github.com/cloudbuilders/openstack-dashboard.git $CACHEDIR/opt/dash

+    git clone https://github.com/cloudbuilders/python-novaclient.git $CACHEDIR/opt/python-novaclient

+    git clone https://github.com/cloudbuilders/keystone.git $CACHEDIR/opt/keystone

+    git clone https://github.com/cloudbuilders/glance.git $CACHEDIR/opt/glance

+fi

+

+# Destroy the old container

+lxc-destroy -n $CONTAINER

+

+# Create the container

+lxc-create -n $CONTAINER -t natty -f $LXC_CONF

+

+# Specify where our container rootfs lives

 ROOTFS=/var/lib/lxc/$CONTAINER/rootfs/

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

+# is able to interact with libvirt.

+chroot $ROOTFS groupadd libvirtd

+chroot $ROOTFS useradd stack -s /bin/bash -d /opt -G libvirtd

+

+# a simple password - pass

+echo stack:pass | chroot $ROOTFS chpasswd

+

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

+# stack requires)

+echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers

+

+# Gracefully cp only if source file/dir exists

+function cp_it {

+    if [ -e $1 ] || [ -d $1 ]; then

+        cp -pr $1 $2

+    fi

+}

+

 # Copy over your ssh keys and env if desired

 if [ "$COPYENV" = "1" ]; then

-    cp -pr ~/.ssh $ROOTFS/root/.ssh

-    cp -p ~/.ssh/id_rsa.pub $ROOTFS/root/.ssh/authorized_keys

-    cp -pr ~/.gitconfig $ROOTFS/root/.gitconfig

-    cp -pr ~/.vimrc $ROOTFS/root/.vimrc

-    cp -pr ~/.bashrc $ROOTFS/root/.bashrc

+    cp_it ~/.ssh $ROOTFS/opt/.ssh

+    cp_it ~/.ssh/id_rsa.pub $ROOTFS/opt/.ssh/authorized_keys

+    cp_it ~/.gitconfig $ROOTFS/opt/.gitconfig

+    cp_it ~/.vimrc $ROOTFS/opt/.vimrc

+    cp_it ~/.bashrc $ROOTFS/opt/.bashrc

 fi

+# Give stack ownership over /opt so it may do the work needed

+chroot $ROOTFS chown -R stack /opt

+

 # Configure instance network

 INTERFACES=$ROOTFS/etc/network/interfaces

 cat > $INTERFACES <<EOF

@@ -67,57 +119,41 @@ iface eth0 inet static

         gateway $CONTAINER_GATEWAY

 EOF

-# Configure the first run installer

-INSTALL_SH=$ROOTFS/root/install.sh

-cat > $INSTALL_SH <<EOF

+# Configure the runner

+RUN_SH=$ROOTFS/opt/run.sh

+cat > $RUN_SH <<EOF

 #!/bin/bash

-echo \#\!/bin/sh -e > /etc/rc.local

-echo "nameserver $NAMESERVER" | resolvconf -a eth0

+# Make sure dns is set up

+echo "nameserver $NAMESERVER" | sudo resolvconf -a eth0

 sleep 1

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

-# is able to interact with libvirt.

-groupadd libvirtd

-useradd stack -s /bin/bash -d /opt -G libvirtd

-# a simple password - pass

-echo stack:pass | chpasswd

-

-# give stack ownership over /opt so it may do the work needed

-chown -R stack /opt

-

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

-# stack requires)

-

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

+# Kill any existing screens

+killall screen

 # Install and run stack.sh

-apt-get update

-apt-get -y --force-yes install git-core vim-nox sudo

-su -c "git clone git://github.com/cloudbuilders/nfs-stack.git /opt/nfs-stack" stack

-su -c "cd /opt/nfs-stack && ./stack.sh" stack

+sudo apt-get update

+sudo apt-get -y --force-yes install git-core vim-nox sudo

+if [ ! -d "/opt/nfs-stack" ]; then

+    git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack

+fi

+cd /opt/nfs-stack && $STACKSH_PARAMS ./stack.sh > /opt/run.sh.log

 EOF

-chmod 700 $INSTALL_SH

+# Make the run.sh executable

+chmod 755 $RUN_SH

-# Make installer run on boot

+# Make runner launch on boot

 RC_LOCAL=$ROOTFS/etc/rc.local

 cat > $RC_LOCAL <<EOF

 #!/bin/sh -e

-/root/install.sh

+su -c "/opt/run.sh" stack

 EOF

 # Configure cgroup directory

-mkdir -p /cgroup

-mount none -t cgroup /cgroup

+if ! mount | grep -q cgroup; then

+    mkdir -p /cgroup

+    mount none -t cgroup /cgroup

+fi

 # Start our container

 lxc-start -d -n $CONTAINER

-

-cat << EOF > /bin/remove_dead_cgroup.shecho

-"Removing dead cgroup .$CONTAINER." >> /var/log/cgroup

-rmdir /cgroup/$CONTAINER >> /var/log/cgroup 2>&1

-echo "return value was $?" >> /var/log/cgroup

-EOF

-chmod 755 /bin/remove_dead_cgroup.sh

-echo /bin/remove_dead_cgroup.sh > /cgroup/release_agent

-echo 1 > /cgroup/notify_on_release

new file mode 100644

@@ -0,0 +1,67 @@

+[DEFAULT]

+# Show more verbose log output (sets INFO log level output)

+verbose = True

+

+# Show debugging output in logs (sets DEBUG log level output)

+debug = False

+

+# Address to bind the registry server

+bind_host = 0.0.0.0

+

+# Port the bind the registry server to

+bind_port = 9191

+

+# Log to this file. Make sure you do not set the same log

+# file for both the API and registry servers!

+log_file = /var/log/glance/registry.log

+

+# Send logs to syslog (/dev/log) instead of to file specified by `log_file`

+use_syslog = False

+

+# SQLAlchemy connection string for the reference implementation

+# registry server. Any valid SQLAlchemy connection string is fine.

+# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine

+sql_connection = %SQL_CONN%

+

+# Period in seconds after which SQLAlchemy should reestablish its connection

+# to the database.

+#

+# MySQL uses a default `wait_timeout` of 8 hours, after which it will drop

+# idle connections. This can result in 'MySQL Gone Away' exceptions. If you

+# notice this, you can lower this value to ensure that SQLAlchemy reconnects

+# before MySQL can drop the connection.

+sql_idle_timeout = 3600

+

+# Limit the api to return `param_limit_max` items in a call to a container. If

+# a larger `limit` query param is provided, it will be reduced to this value.

+api_limit_max = 1000

+

+# If a `limit` query param is not provided in an api request, it will

+# default to `limit_param_default`

+limit_param_default = 25

+

+[pipeline:glance-registry]

+pipeline = context registryapp

+# NOTE: use the following pipeline for keystone

+# pipeline = authtoken keystone_shim context registryapp

+

+[app:registryapp]

+paste.app_factory = glance.registry.server:app_factory

+

+[filter:context]

+context_class = glance.registry.context.RequestContext

+paste.filter_factory = glance.common.context:filter_factory

+

+[filter:authtoken]

+paste.filter_factory = keystone.middleware.auth_token:filter_factory

+service_protocol = http

+service_host = 127.0.0.1

+service_port = 5000

+auth_host = 127.0.0.1

+auth_port = 5001

+auth_protocol = http

+auth_uri = http://127.0.0.1:5000/

+admin_token = 999888777666

+

+[filter:keystone_shim]

+paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory

new file mode 100644

@@ -0,0 +1,86 @@

+[DEFAULT]

+# Show more verbose log output (sets INFO log level output)

+verbose = False

+

+# Show debugging output in logs (sets DEBUG log level output)

+debug = False

+

+# Which backend store should Keystone use by default.

+# Default: 'sqlite'

+# Available choices are 'sqlite' [future will include LDAP, PAM, etc]

+default_store = sqlite

+

+# Log to this file. Make sure you do not set the same log

+# file for both the API and registry servers!

+log_file = /opt/keystone/keystone.log

+

+# List of backends to be configured

+backends = keystone.backends.sqlalchemy

+#For LDAP support, add: ,keystone.backends.ldap

+

+# Dictionary Maps every service to a header.Missing services would get header

+# X_(SERVICE_NAME) Key => Service Name, Value => Header Name

+service-header-mappings = {

+	'nova' : 'X-Server-Management-Url',

+	'swift' : 'X-Storage-Url',

+	'cdn' : 'X-CDN-Management-Url'}

+

+# Address to bind the API server

+# TODO Properties defined within app not available via pipeline.

+service_host = 0.0.0.0

+

+# Port the bind the API server to

+service_port = 5000

+

+# Address to bind the Admin API server

+admin_host = 0.0.0.0

+

+# Port the bind the Admin API server to

+admin_port = 5001

+

+#Role that allows to perform admin operations.

+keystone-admin-role = Admin

+

+#Role that allows to perform service admin operations.

+keystone-service-admin-role = KeystoneServiceAdmin

+

+[keystone.backends.sqlalchemy]

+# SQLAlchemy connection string for the reference implementation registry

+# server. Any valid SQLAlchemy connection string is fine.

+# See: http://bit.ly/ideIpI

+#sql_connection = sqlite:///keystone.db

+sql_connection = %SQL_CONN%

+backend_entities = ['UserRoleAssociation', 'Endpoints', 'Role', 'Tenant',

+                    'User', 'Credentials', 'EndpointTemplates', 'Token',

+                    'Service']

+

+# Period in seconds after which SQLAlchemy should reestablish its connection

+# to the database.

+sql_idle_timeout = 30

+

+[pipeline:admin]

+pipeline =

+	urlrewritefilter

+	admin_api

+

+[pipeline:keystone-legacy-auth]

+pipeline =

+	urlrewritefilter

+    legacy_auth

+    RAX-KEY-extension

+    service_api

+

+[app:service_api]

+paste.app_factory = keystone.server:service_app_factory

+

+[app:admin_api]

+paste.app_factory = keystone.server:admin_app_factory

+

+[filter:urlrewritefilter]

+paste.filter_factory = keystone.middleware.url:filter_factory

+

+[filter:legacy_auth]

+paste.filter_factory = keystone.frontends.legacy_token_auth:filter_factory

+

+[filter:RAX-KEY-extension]

+paste.filter_factory = keystone.contrib.extensions.service.raxkey.frontend:filter_factory

@@ -12,6 +12,7 @@

 #     ./stack.sh

 #

 # or run on a single line ``MYSQL_PASS=simple ./stack.sh``

+# or simply ``./stack.sh``

 # This script exits on an error so that errors don't compound and you see 

 # only the first error that occured.

@@ -36,6 +37,9 @@ API_DIR=$DEST/openstackx

 NOVNC_DIR=$DEST/noVNC

 MUNIN_DIR=$DEST/openstack-munin

+# Specify which services to launch.  These generally correspond to screen tabs

+ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash}

+

 # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable

 if [ ! -n "$HOST_IP" ]; then

     HOST_IP=`LC_ALL=C /sbin/ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`

@@ -46,6 +50,7 @@ INTERFACE=${INTERFACE:-eth0}

 FLOATING_RANGE=${FLOATING_RANGE:-10.6.0.0/27}

 FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}

 NET_MAN=${NET_MAN:-VlanManager}

+EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}

 # If you are using FlatDHCP on multiple hosts, set the ``FLAT_INTERFACE``

 # variable but make sure that the interface doesn't already have an

@@ -55,11 +60,15 @@ NET_MAN=${NET_MAN:-VlanManager}

 # Nova hypervisor configuration

 LIBVIRT_TYPE=${LIBVIRT_TYPE:-qemu}

-

-# TODO: switch to mysql for all services

+# Mysql connection info

+MYSQL_USER=${MYSQL_USER:-root}

 MYSQL_PASS=${MYSQL_PASS:-nova}

-SQL_CONN=${SQL_CONN:-mysql://root:$MYSQL_PASS@localhost/nova}

-# TODO: set rabbitmq conn string explicitly as well

+MYSQL_HOST=${MYSQL_HOST:-localhost}

+# don't specify /db in this string, so we can use it for multiple services

+BASE_SQL_CONN=${BASE_SQL_CONN:-mysql://$MYSQL_USER:$MYSQL_PASS@$MYSQL_HOST}

+

+# Rabbit connection info

+RABBIT_HOST=${RABBIT_HOST:-localhost}

 # Install Packages

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

@@ -127,18 +136,13 @@ sudo usermod -a -G libvirtd `whoami`

 # if kvm wasn't running before we need to restart libvirt to enable it

 sudo /etc/init.d/libvirt-bin restart

-# FIXME(ja): should LIBVIRT_TYPE be kvm if kvm module is loaded?

+## FIXME(ja): should LIBVIRT_TYPE be kvm if kvm module is loaded?

-# setup nova instance directory

-mkdir -p $NOVA_DIR/instances

+# add useful screenrc

+cp $DIR/files/screenrc ~/.screenrc

+

+# TODO: update current user to allow sudo for all commands in files/sudo/*

-# if there is a partition labeled nova-instances use it (ext filesystems

-# can be labeled via e2label)

-# FIXME: if already mounted this blows up...

-if [ -L /dev/disk/by-label/nova-instances ]; then

-    sudo mount -L nova-instances $NOVA_DIR/instances

-    sudo chown -R `whoami` $NOVA_DIR/instances

-fi

 # Dashboard

 # ---------

@@ -148,27 +152,33 @@ fi

 # Dash currently imports quantum even if you aren't using it.  Instead 

 # of installing quantum we can create a simple module that will pass the 

 # initial imports

-mkdir $DASH_DIR/openstack-dashboard/quantum || true

-touch $DASH_DIR/openstack-dashboard/quantum/__init__.py || true

-touch $DASH_DIR/openstack-dashboard/quantum/client.py || true

+sudo mkdir -p  $DASH_DIR/openstack-dashboard/quantum || true

+sudo touch $DASH_DIR/openstack-dashboard/quantum/__init__.py

+sudo touch $DASH_DIR/openstack-dashboard/quantum/client.py

 cd $DASH_DIR/openstack-dashboard

-[ ! -r local/local_settings.py ] && cp local/local_settings.py.example local/local_settings.py

+sudo cp local/local_settings.py.example local/local_settings.py

 dashboard/manage.py syncdb

-# setup apache

-# create an empty directory to use as our 

-mkdir -p $DASH_DIR/.blackhole

+# create an empty directory that apache uses as docroot

+sudo mkdir -p $DASH_DIR/.blackhole

-# FIXME(ja): can't figure out how to make $DASH_DIR work in sed, also install to available/a2e it 

-cat $DIR/files/000-default.template | sed 's/%DASH_DIR%/\/opt\/dash/g' > /tmp/000-default

-sudo mv /tmp/000-default /etc/apache2/sites-enabled

+## Configure apache's 000-default to run dashboard

+sudo cp $DIR/files/000-default.template /etc/apache2/sites-enabled/000-default

+sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default

-# ``python setup.py develop`` left some files owned by root in $DASH_DIR and

+# ``python setup.py develop`` left some files owned by root in ``DASH_DIR`` and

 # others by the original owner.  We need to change the owner to apache so

 # dashboard can run

 sudo chown -R www-data:www-data $DASH_DIR

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

+sudo mysql -uroot -p$MYSQL_PASS -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' WITH GRANT OPTION;"

+

+# Edit /etc/mysql/my.cnf to change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0) and restart the mysql service:

+sudo sed -i 's/127.0.0.1/0.0.0.0/g' /etc/mysql/my.cnf

+sudo service mysql restart

+

 # Munin

 # -----

@@ -196,20 +206,26 @@ sudo restart munin-node

 # Glance

 # ------

+# Glance uses ``/var/lib/glance`` and ``/var/log/glance`` by default, so

+# we need to insure that our user has permissions to use them.

 sudo mkdir -p /var/log/glance

-sudo chown `whoami` /var/log/glance 

-

-# add useful screenrc

-cp $DIR/files/screenrc ~/.screenrc

+sudo chown -R `whoami` /var/log/glance 

+sudo mkdir -p /var/lib/glance

+sudo chown -R `whoami` /var/lib/glance

-# TODO: update current user to allow sudo for all commands in files/sudo/*

+# Delete existing images/database as glance will recreate the db on startup

+rm -rf /var/lib/glance/images/*

+# (re)create glance database

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE glance;' || true

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE glance;'

+# Copy over our glance-registry.conf

+GLANCE_CONF=$GLANCE_DIR/etc/glance-registry.conf

+cp $DIR/files/glance-registry.conf $GLANCE_CONF

+sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/glance,g" -i $GLANCE_CONF

 # Nova

 # ----

-NL=`echo -ne '\015'`

-

-

 function add_nova_flag {

     echo "$1" >> $NOVA_DIR/bin/nova.conf

 }

@@ -223,13 +239,16 @@ add_nova_flag "--network_manager=nova.network.manager.$NET_MAN"

 add_nova_flag "--my_ip=$HOST_IP"

 add_nova_flag "--public_interface=$INTERFACE"

 add_nova_flag "--vlan_interface=$INTERFACE"

-add_nova_flag "--sql_connection=$SQL_CONN"

+add_nova_flag "--sql_connection=$BASE_SQL_CONN/nova"

 add_nova_flag "--libvirt_type=$LIBVIRT_TYPE"

 add_nova_flag "--osapi_extensions_path=$API_DIR/extensions"

 add_nova_flag "--vncproxy_url=http://$HOST_IP:6080"

 add_nova_flag "--vncproxy_wwwroot=$NOVNC_DIR/"

 add_nova_flag "--api_paste_config=$KEYSTONE_DIR/examples/paste/nova-api-paste.ini"

 add_nova_flag "--image_service=nova.image.glance.GlanceImageService"

+add_nova_flag "--image_service=nova.image.glance.GlanceImageService"

+add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"

+add_nova_flag "--rabbit_host=$RABBIT_HOST"

 if [ -n "$FLAT_INTERFACE" ]; then

     add_nova_flag "--flat_interface=$FLAT_INTERFACE"

 fi

@@ -238,6 +257,17 @@ fi

 screen -d -m -S nova -t nova

 sleep 1

+# setup nova instance directory

+mkdir -p $NOVA_DIR/instances

+

+# if there is a partition labeled nova-instances use it (ext filesystems

+# can be labeled via e2label)

+## FIXME: if already mounted this blows up...

+if [ -L /dev/disk/by-label/nova-instances ]; then

+    sudo mount -L nova-instances $NOVA_DIR/instances

+    sudo chown -R `whoami` $NOVA_DIR/instances

+fi

+

 # Clean out the instances directory

 rm -rf $NOVA_DIR/instances/*

@@ -247,45 +277,53 @@ rm -rf $NOVA_DIR/networks

 mkdir -p $NOVA_DIR/networks

 # (re)create nova database

-mysql -uroot -p$MYSQL_PASS -e 'DROP DATABASE nova;' || true

-mysql -uroot -p$MYSQL_PASS -e 'CREATE DATABASE nova;'

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE nova;' || true

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE nova;'

 $NOVA_DIR/bin/nova-manage db sync

-# initialize keystone with default users/endpoints

-rm -f /opt/keystone/keystone.db

-# FIXME keystone creates a keystone.log wherever you run it from (bugify)

-cd /tmp

-BIN_DIR=$KEYSTONE_DIR/bin bash $DIR/files/keystone_data.sh

-

 # create a small network

 $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 32

 # create some floating ips

 $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE

-# delete existing glance images/database.  Glance will recreate the db

-# when it is ran.

-# FIXME: configure glance not to shove files in /var/lib/glance?

-sudo mkdir -p /var/lib/glance

-sudo chown -R `whoami` /var/lib/glance

-rm -rf /var/lib/glance/images/*

-rm -f $GLANCE_DIR/glance.sqlite

+# Keystone

+# --------

+

+# (re)create keystone database

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'DROP DATABASE keystone;' || true

+mysql -u$MYSQL_USER -p$MYSQL_PASS -e 'CREATE DATABASE keystone;'

+

+# FIXME (anthony) keystone should use keystone.conf.example

+KEYSTONE_CONF=$KEYSTONE_DIR/etc/keystone.conf

+cp $DIR/files/keystone.conf $KEYSTONE_CONF

+sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/keystone,g" -i $KEYSTONE_CONF

+

+# initialize keystone with default users/endpoints

+BIN_DIR=$KEYSTONE_DIR/bin bash $DIR/files/keystone_data.sh

+

 # Launch Services

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

 # nova api crashes if we start it with a regular screen command,

 # so send the start command by forcing text into the window.

+# Only run the services specified in ``ENABLED_SERVICES``

+

+NL=`echo -ne '\015'`

+

 function screen_it {

-    screen -S nova -X screen -t $1

-    screen -S nova -p $1 -X stuff "$2$NL"

+    if [[ "$ENABLED_SERVICES" =~ "$1" ]]; then

+        screen -S nova -X screen -t $1

+        screen -S nova -p $1 -X stuff "$2$NL"

+    fi

 }

 screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf"

 screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf"

 # keystone drops a keystone.log where if it is run, so change the path to

 # where it can write

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

+screen_it key "cd /tmp; $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF"

 screen_it n-api "$NOVA_DIR/bin/nova-api"

 screen_it n-cpu "$NOVA_DIR/bin/nova-compute"

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

@@ -314,4 +352,3 @@ tar -zxf $DEST/tty.tgz

 glance add name="tty-kernel" is_public=true container_format=aki disk_format=aki < aki-tty/image 

 glance add name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < ari-tty/image 

 glance add name="tty" is_public=true container_format=ami disk_format=ami kernel_id=1 ramdisk_id=2 < ami-tty/image

-