deleted file mode 100644

@@ -1,4 +0,0 @@

-apache2

-libapache2-mod-wsgi

-python-dateutil

-python-anyjson

deleted file mode 100644

@@ -1,13 +0,0 @@

-pep8

-pylint

-python-pip

-screen

-unzip

-wget

-psmisc

-git-core

-lsof # useful when debugging

-openssh-server

-vim-nox

-locate # useful when debugging

-munin

deleted file mode 100644

@@ -1,8 +0,0 @@

-python-eventlet

-python-routes

-python-greenlet

-python-argparse

-python-sqlalchemy

-python-wsgiref

-python-pastedeploy

-python-xattr

deleted file mode 100644

@@ -1,15 +0,0 @@

-python-setuptools

-python-dev

-python-lxml

-python-pastescript

-python-pastedeploy

-python-paste

-sqlite3

-python-pysqlite2

-python-sqlalchemy

-python-webob

-python-greenlet

-python-routes

-libldap2-dev

-libsasl2-dev

-

deleted file mode 100644

@@ -1,35 +0,0 @@

-dnsmasq-base

-kpartx

-mysql-server

-python-mysqldb

-kvm

-gawk

-iptables

-ebtables

-sqlite3

-sudo

-kvm

-libvirt-bin

-vlan

-curl

-rabbitmq-server

-socat # used by ajaxterm

-python-mox

-python-paste

-python-migrate

-python-gflags

-python-greenlet

-python-libvirt

-python-libxml2

-python-routes

-python-netaddr

-python-pastedeploy

-python-eventlet

-python-cheetah

-python-carrot

-python-tempita

-python-sqlalchemy

-python-suds

-python-lockfile

-python-m2crypto

-python-boto

deleted file mode 100644

@@ -1,18 +0,0 @@

-# a collection of packages that speed up installation as they are dependencies

-# of packages we can't install during bootstraping (rabbitmq-server, 

-# mysql-server, libvirt-bin)

-#

-# NOTE: only add packages to this file that aren't needed directly

-mysql-common

-mysql-client-5.1

-erlang-base

-erlang-ssl 

-erlang-nox

-erlang-inets

-erlang-mnesia

-libhtml-template-perl

-gettext-base

-libavahi-client3

-libxml2-utils

-libpciaccess0

-libparted0debian1

@@ -55,8 +55,8 @@ 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/*`

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

+    chroot $CACHEDIR pip install `cat files/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

@@ -13,8 +13,8 @@ if [ ! -d proto ]; then

     debootstrap natty proto

     cp files/sources.list proto/etc/apt/sources.list

     chroot proto apt-get update

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

-    chroot proto pip install `cat pips/*`

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

+    chroot proto pip install `cat files/pips/*`

     git clone https://github.com/cloudbuilders/nova.git proto/opt/nova

     git clone https://github.com/cloudbuilders/openstackx.git proto/opt/openstackx

     git clone https://github.com/cloudbuilders/noVNC.git proto/opt/noVNC

@@ -34,14 +34,13 @@ echo "127.0.0.1 localhost $NAME" > $DEST/etc/hosts

 # copy kernel modules

 cp -pr /lib/modules/`uname -r` $DEST/lib/modules

-# inject stack.sh files

-cp -r files $DEST/opt/files

 # copy openstack installer and requirement lists to a new directory.

 mkdir -p $DEST/opt

+

+# inject stack.sh and dependant files

+cp -r files $DEST/opt/files

 cp stack.sh $DEST/opt/stack.sh

-cp -r pips $DEST/opt

-cp -r apts $DEST/opt

 # injecting root's public ssh key if it exists

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

new file mode 100644

@@ -0,0 +1,4 @@

+apache2

+libapache2-mod-wsgi

+python-dateutil

+python-anyjson

new file mode 100644

@@ -0,0 +1,13 @@

+pep8

+pylint

+python-pip

+screen

+unzip

+wget

+psmisc

+git-core

+lsof # useful when debugging

+openssh-server

+vim-nox

+locate # useful when debugging

+munin

new file mode 100644

@@ -0,0 +1,8 @@

+python-eventlet

+python-routes

+python-greenlet

+python-argparse

+python-sqlalchemy

+python-wsgiref

+python-pastedeploy

+python-xattr

new file mode 100644

@@ -0,0 +1,15 @@

+python-setuptools

+python-dev

+python-lxml

+python-pastescript

+python-pastedeploy

+python-paste

+sqlite3

+python-pysqlite2

+python-sqlalchemy

+python-webob

+python-greenlet

+python-routes

+libldap2-dev

+libsasl2-dev

+

new file mode 100644

@@ -0,0 +1,35 @@

+dnsmasq-base

+kpartx

+mysql-server

+python-mysqldb

+kvm

+gawk

+iptables

+ebtables

+sqlite3

+sudo

+kvm

+libvirt-bin

+vlan

+curl

+rabbitmq-server

+socat # used by ajaxterm

+python-mox

+python-paste

+python-migrate

+python-gflags

+python-greenlet

+python-libvirt

+python-libxml2

+python-routes

+python-netaddr

+python-pastedeploy

+python-eventlet

+python-cheetah

+python-carrot

+python-tempita

+python-sqlalchemy

+python-suds

+python-lockfile

+python-m2crypto

+python-boto

new file mode 100644

@@ -0,0 +1,18 @@

+# a collection of packages that speed up installation as they are dependencies

+# of packages we can't install during bootstraping (rabbitmq-server, 

+# mysql-server, libvirt-bin)

+#

+# NOTE: only add packages to this file that aren't needed directly

+mysql-common

+mysql-client-5.1

+erlang-base

+erlang-ssl 

+erlang-nox

+erlang-inets

+erlang-mnesia

+libhtml-template-perl

+gettext-base

+libavahi-client3

+libxml2-utils

+libpciaccess0

+libparted0debian1

new file mode 100644

@@ -0,0 +1,21 @@

+nose==1.0.0

+Django==1.3

+django-nose==0.1.2

+django-mailer

+django-registration==0.7

+kombu

+python-cloudfiles

+python-dateutil

+routes

+webob

+sqlalchemy

+paste

+PasteDeploy

+sqlalchemy-migrate

+eventlet

+xattr

+pep8

+pylint

+

+-e git+https://github.com/jacobian/openstack.compute.git#egg=openstack

+

deleted file mode 100644

@@ -1,21 +0,0 @@

-nose==1.0.0

-Django==1.3

-django-nose==0.1.2

-django-mailer

-django-registration==0.7

-kombu

-python-cloudfiles

-python-dateutil

-routes

-webob

-sqlalchemy

-paste

-PasteDeploy

-sqlalchemy-migrate

-eventlet

-xattr

-pep8

-pylint

-

--e git+https://github.com/jacobian/openstack.compute.git#egg=openstack

-

@@ -21,12 +21,12 @@ if ! grep -q natty /etc/lsb-release; then

     fi

 fi

-# stack.sh keeps the list of **apt** and **pip** dependencies in files.  

-# Additionally we have a few config templates and other useful files useful 

-# installation.  They are needed to be located at ``apts``, ``files`` and 

-# ``pips`` in the ``DEVSTACK`` directory (next to this script).

-DEVSTACK=`pwd`

-if [ ! -d $DEVSTACK/apts ] || [ ! -d $DEVSTACK/files ] || [ ! -d $DEVSTACK/pips ]; then

+# stack.sh keeps the list of **apt** and **pip** dependencies in external 

+# files, along with config templates and other useful files.  You can find these

+# in the ``files`` directory (next to this script).  We will reference this 

+# directory using the ``DEVSTACK`` variable in this script.

+DEVSTACK=`pwd`/files

+if [ ! -d $DEVSTACK ]; then

     echo "ERROR: missing devstack files - did you grab more than just stack.sh?"

     exit 1

 fi

@@ -164,7 +164,7 @@ cd $DASH_DIR/openstack-dashboard; sudo python setup.py develop

 # Add a useful screenrc.  This isn't required to run openstack but is we do

 # it since we are going to run the services in screen for simple 

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

+cp $DEVSTACK/screenrc ~/.screenrc

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

@@ -208,7 +208,7 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then

     cd $DASH_DIR/openstack-dashboard

     # Includes settings for Nixon, to expose munin charts.

-    sudo cp $DEVSTACK/files/dash_settings.py local/local_settings.py

+    sudo cp $DEVSTACK/dash_settings.py local/local_settings.py

     dashboard/manage.py syncdb

@@ -216,12 +216,12 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then

     sudo mkdir -p $DASH_DIR/.blackhole

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

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

+    sudo cp $DEVSTACK/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

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

-    # dashboard can run

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

+    # and others are owned by the user you are using to run this script.  

+    # We need to change the owner to apache for dashboard to run.

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

 fi

@@ -271,7 +271,7 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then

     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 $DEVSTACK/files/glance-registry.conf $GLANCE_CONF

+    cp $DEVSTACK/glance-registry.conf $GLANCE_CONF

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

 fi

@@ -367,11 +367,11 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then

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

     KEYSTONE_CONF=$KEYSTONE_DIR/etc/keystone.conf

-    cp $DEVSTACK/files/keystone.conf $KEYSTONE_CONF

+    cp $DEVSTACK/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 $DEVSTACK/files/keystone_data.sh

+    BIN_DIR=$KEYSTONE_DIR/bin bash $DEVSTACK/keystone_data.sh

 fi