@@ -1,3 +1,5 @@

 proto

 *~

+*.log

+src

 localrc

old mode 100755

new mode 100644

@@ -84,6 +84,15 @@ nova boot --flavor $FLAVOR --image $IMAGE $NAME --security_groups=$SECGROUP

 # Waiting for boot

 # ----------------

+# Max time to wait while vm goes from build to active state

+ACTIVE_TIMEOUT=${ACTIVE_TIMEOUT:-10}

+

+# Max time till the vm is bootable

+BOOT_TIMEOUT=${BOOT_TIMEOUT:-15}

+

+# Max time to wait for proper association and dis-association.

+ASSOCIATE_TIMEOUT=${ASSOCIATE_TIMEOUT:-10}

+

 # check that the status is active within ACTIVE_TIMEOUT seconds

 if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova show $NAME | grep status | grep -q ACTIVE; do sleep 1; done"; then

     echo "server didn't become active!"

@@ -158,7 +167,7 @@ ping -c1 -w1 $IP

 nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0

 # FIXME (anthony): make xs support security groups

-if [ "$VIRT_DRIVER" != "xenserver"]; then

+if [ "$VIRT_DRIVER" != "xenserver" ]; then

     # test we can aren't able to ping our floating ip within ASSOCIATE_TIMEOUT seconds

     if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ping -c1 -w1 $FLOATING_IP; do sleep 1; done"; then

         print "Security group failure - ping should not be allowed!"

@@ -1,7 +1,9 @@

 dnsmasq-base

+dnsmasq-utils # for dhcp_release

 kpartx

 parted

-mysql-server

+arping # used for send_arp_for_ha option in nova-network

+mysql-server # NOPRIME

 python-mysqldb

 kvm

 gawk

@@ -10,10 +12,10 @@ ebtables

 sqlite3

 sudo

 kvm

-libvirt-bin

+libvirt-bin # NOPRIME

 vlan

 curl

-rabbitmq-server

+rabbitmq-server # NOPRIME

 socat # used by ajaxterm

 python-mox

 python-paste

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

new file mode 100644

@@ -0,0 +1,17 @@

+curl

+gcc

+memcached # NOPRIME

+python-configobj

+python-coverage

+python-dev

+python-eventlet

+python-greenlet

+python-netifaces

+python-nose

+python-pastedeploy

+python-setuptools

+python-simplejson

+python-webob

+python-xattr

+sqlite3

+xfsprogs

@@ -24,7 +24,7 @@ registry_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 = %DEST%/glance/api.log

+#log_file = %DEST%/glance/api.log

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

 use_syslog = %SYSLOG%

@@ -13,7 +13,7 @@ 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 = %DEST%/glance/registry.log

+#log_file = %DEST%/glance/registry.log

 # Where to store images

 filesystem_store_datadir = %DEST%/glance/images

@@ -30,12 +30,13 @@ $BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin

 $BIN_DIR/keystone-manage $* service add nova compute "Nova Compute Service"

 $BIN_DIR/keystone-manage $* service add glance image "Glance Image Service"

 $BIN_DIR/keystone-manage $* service add keystone identity "Keystone Identity Service"

+$BIN_DIR/keystone-manage $* service add swift object-store "Swift Service"

 #endpointTemplates

 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1

 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1

 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:35357/v2.0 http://%HOST_IP%:5000/v2.0 1 1

-# $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1

+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1

 # Tokens

 $BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00

new file mode 100644

@@ -0,0 +1,127 @@

+#######

+# EC2 #

+#######

+

+[composite:ec2]

+use = egg:Paste#urlmap

+/: ec2versions

+/services/Cloud: ec2cloud

+/services/Admin: ec2admin

+/latest: ec2metadata

+/2007-01-19: ec2metadata

+/2007-03-01: ec2metadata

+/2007-08-29: ec2metadata

+/2007-10-10: ec2metadata

+/2007-12-15: ec2metadata

+/2008-02-01: ec2metadata

+/2008-09-01: ec2metadata

+/2009-04-04: ec2metadata

+/1.0: ec2metadata

+

+[pipeline:ec2cloud]

+pipeline = logrequest totoken authtoken keystonecontext cloudrequest authorizer ec2executor

+

+[pipeline:ec2admin]

+pipeline = logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor

+

+[pipeline:ec2metadata]

+pipeline = logrequest ec2md

+

+[pipeline:ec2versions]

+pipeline = logrequest ec2ver

+

+[filter:logrequest]

+paste.filter_factory = nova.api.ec2:RequestLogging.factory

+

+[filter:ec2lockout]

+paste.filter_factory = nova.api.ec2:Lockout.factory

+

+[filter:totoken]

+paste.filter_factory = keystone.middleware.ec2_token:EC2Token.factory

+

+[filter:ec2noauth]

+paste.filter_factory = nova.api.ec2:NoAuth.factory

+

+[filter:authenticate]

+paste.filter_factory = nova.api.ec2:Authenticate.factory

+

+[filter:cloudrequest]

+controller = nova.api.ec2.cloud.CloudController

+paste.filter_factory = nova.api.ec2:Requestify.factory

+

+[filter:adminrequest]

+controller = nova.api.ec2.admin.AdminController

+paste.filter_factory = nova.api.ec2:Requestify.factory

+

+[filter:authorizer]

+paste.filter_factory = nova.api.ec2:Authorizer.factory

+

+[app:ec2executor]

+paste.app_factory = nova.api.ec2:Executor.factory

+

+[app:ec2ver]

+paste.app_factory = nova.api.ec2:Versions.factory

+

+[app:ec2md]

+paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.factory

+

+#############

+# Openstack #

+#############

+

+[composite:osapi]

+use = egg:Paste#urlmap

+/: osversions

+/v1.0: openstackapi10

+/v1.1: openstackapi11

+

+[pipeline:openstackapi10]

+pipeline = faultwrap authtoken keystonecontext ratelimit osapiapp10

+

+[pipeline:openstackapi11]

+pipeline = faultwrap authtoken keystonecontext ratelimit extensions osapiapp11

+

+[filter:faultwrap]

+paste.filter_factory = nova.api.openstack:FaultWrapper.factory

+

+[filter:auth]

+paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory

+

+[filter:noauth]

+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory

+

+[filter:ratelimit]

+paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory

+

+[filter:extensions]

+paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory

+

+[app:osapiapp10]

+paste.app_factory = nova.api.openstack:APIRouterV10.factory

+

+[app:osapiapp11]

+paste.app_factory = nova.api.openstack:APIRouterV11.factory

+

+[pipeline:osversions]

+pipeline = faultwrap osversionapp

+

+[app:osversionapp]

+paste.app_factory = nova.api.openstack.versions:Versions.factory

+

+##########

+# Shared #

+##########

+

+[filter:keystonecontext]

+paste.filter_factory = keystone.middleware.nova_keystone_context:NovaKeystoneContext.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 = 35357

+auth_protocol = http

+auth_uri = http://127.0.0.1:5000/

+admin_token = %SERVICE_TOKEN%

@@ -41,7 +41,7 @@ Cmnd_Alias NOVACMDS = /bin/chmod /var/lib/nova/tmp/*/root/.ssh, \

                       /usr/bin/socat,                           \

                       /sbin/parted,                             \

                       /usr/sbin/dnsmasq,                        \

-                      /usr/bin/arping

+                      /usr/sbin/arping

 %USER% ALL = (root) NOPASSWD: SETENV: NOVACMDS

new file mode 100644

@@ -0,0 +1,20 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+swift_dir = %SWIFT_CONFIG_LOCATION%

+

+[pipeline:main]

+pipeline = account-server

+

+[app:account-server]

+use = egg:swift#account

+

+[account-replicator]

+vm_test_mode = yes

+

+[account-auditor]

+

+[account-reaper]

new file mode 100644

@@ -0,0 +1,22 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+swift_dir = %SWIFT_CONFIG_LOCATION%

+

+[pipeline:main]

+pipeline = container-server

+

+[app:container-server]

+use = egg:swift#container

+

+[container-replicator]

+vm_test_mode = yes

+

+[container-updater]

+

+[container-auditor]

+

+[container-sync]

new file mode 100644

@@ -0,0 +1,20 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+swift_dir = %SWIFT_CONFIG_LOCATION%

+

+[pipeline:main]

+pipeline = object-server

+

+[app:object-server]

+use = egg:swift#object

+

+[object-replicator]

+vm_test_mode = yes

+

+[object-updater]

+

+[object-auditor]

new file mode 100644

@@ -0,0 +1,32 @@

+[DEFAULT]

+bind_port = 8080

+user = %USER%

+log_facility = LOG_LOCAL1

+swift_dir = %SWIFT_CONFIG_LOCATION%

+

+[pipeline:main]

+pipeline = healthcheck cache %AUTH_SERVER% proxy-server

+

+[app:proxy-server]

+use = egg:swift#proxy

+allow_account_management = true

+account_autocreate = true

+

+[filter:keystone]

+use = egg:swiftkeystone2#keystone2

+keystone_admin_token = %SERVICE_TOKEN%

+keystone_url = http://localhost:35357/v2.0

+

+[filter:tempauth]

+use = egg:swift#tempauth

+user_admin_admin = admin .admin .reseller_admin

+user_test_tester = testing .admin

+user_test2_tester2 = testing2 .admin

+user_test_tester3 = testing3

+bind_ip = 0.0.0.0

+

+[filter:healthcheck]

+use = egg:swift#healthcheck

+

+[filter:cache]

+use = egg:swift#memcache

new file mode 100644

@@ -0,0 +1,79 @@

+uid = %USER%

+gid = %GROUP%

+log file = /var/log/rsyncd.log

+pid file = /var/run/rsyncd.pid

+address = 127.0.0.1

+

+[account6012]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/account6012.lock

+

+[account6022]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/account6022.lock

+

+[account6032]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/account6032.lock

+

+[account6042]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/account6042.lock

+

+

+[container6011]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/container6011.lock

+

+[container6021]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/container6021.lock

+

+[container6031]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/container6031.lock

+

+[container6041]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/container6041.lock

+

+

+[object6010]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/object6010.lock

+

+[object6020]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/object6020.lock

+

+[object6030]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/object6030.lock

+

+[object6040]

+max connections = 25

+path = %SWIFT_DATA_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/object6040.lock

new file mode 100755

@@ -0,0 +1,26 @@

+#!/bin/bash

+

+cd %SWIFT_CONFIG_LOCATION%

+

+rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz

+

+swift-ring-builder object.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder object.builder add z1-127.0.0.1:6010/sdb1 1

+swift-ring-builder object.builder add z2-127.0.0.1:6020/sdb2 1

+swift-ring-builder object.builder add z3-127.0.0.1:6030/sdb3 1

+swift-ring-builder object.builder add z4-127.0.0.1:6040/sdb4 1

+swift-ring-builder object.builder rebalance

+

+swift-ring-builder container.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder container.builder add z1-127.0.0.1:6011/sdb1 1

+swift-ring-builder container.builder add z2-127.0.0.1:6021/sdb2 1

+swift-ring-builder container.builder add z3-127.0.0.1:6031/sdb3 1

+swift-ring-builder container.builder add z4-127.0.0.1:6041/sdb4 1

+swift-ring-builder container.builder rebalance

+

+swift-ring-builder account.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder account.builder add z1-127.0.0.1:6012/sdb1 1

+swift-ring-builder account.builder add z2-127.0.0.1:6022/sdb2 1

+swift-ring-builder account.builder add z3-127.0.0.1:6032/sdb3 1

+swift-ring-builder account.builder add z4-127.0.0.1:6042/sdb4 1

+swift-ring-builder account.builder rebalance

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/bash

+

+swift-init all restart

new file mode 100644

@@ -0,0 +1,3 @@

+[swift-hash]

+# random unique string that can never change (DO NOT LOSE)

+swift_hash_path_suffix = %SWIFT_HASH%

@@ -70,7 +70,7 @@ fi

 # called ``localrc``

 #

 # If ``localrc`` exists, then ``stackrc`` will load those settings.  This is

-# useful for changing a branch or repostiory to test other versions.  Also you

+# useful for changing a branch or repository to test other versions.  Also you

 # can store your other settings like **MYSQL_PASSWORD** or **ADMIN_PASSWORD** instead

 # of letting devstack generate random ones for you.

 source ./stackrc

@@ -103,8 +103,7 @@ if [[ $EUID -eq 0 ]]; then

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

     # ability to run sudo

-    apt_get update

-    apt_get install sudo

+    dpkg -l sudo || apt_get update && apt_get install sudo

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

         echo "Creating a user called stack"

@@ -150,6 +149,12 @@ KEYSTONE_DIR=$DEST/keystone

 NOVACLIENT_DIR=$DEST/python-novaclient

 OPENSTACKX_DIR=$DEST/openstackx

 NOVNC_DIR=$DEST/noVNC

+SWIFT_DIR=$DEST/swift

+SWIFT_KEYSTONE_DIR=$DEST/swift-keystone2

+QUANTUM_DIR=$DEST/quantum

+

+# Default Quantum Plugin

+Q_PLUGIN=${Q_PLUGIN:-openvswitch}

 # 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,horizon,mysql,rabbit}

@@ -169,6 +174,9 @@ if [ ! -n "$HOST_IP" ]; then

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

 fi

+# Service startup timeout

+SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}

+

 # Generic helper to configure passwords

 function read_password {

     set +o xtrace

@@ -224,7 +232,7 @@ VLAN_INTERFACE=${VLAN_INTERFACE:-$PUBLIC_INTERFACE}

 # Multi-host is a mode where each compute node runs its own network node.  This

 # allows network operations and routing for a VM to occur on the server that is

 # running the VM - removing a SPOF and bandwidth bottleneck.

-MULTI_HOST=${MULTI_HOST:-0}

+MULTI_HOST=${MULTI_HOST:-False}

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

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

@@ -239,11 +247,22 @@ MULTI_HOST=${MULTI_HOST:-0}

 # If you are running on a single node and don't need to access the VMs from

 # devices other than that node, you can set the flat interface to the same

 # value as ``FLAT_NETWORK_BRIDGE``.  This will stop the network hiccup from

-# occuring.

+# occurring.

 FLAT_INTERFACE=${FLAT_INTERFACE:-eth0}

 ## FIXME(ja): should/can we check that FLAT_INTERFACE is sane?

+# Using Quantum networking:

+#

+# Make sure that q-svc is enabled in ENABLED_SERVICES.  If it is the network

+# manager will be set to the QuantumManager.

+#

+# If you're planning to use the Quantum openvswitch plugin, set Q_PLUGIN to

+# "openvswitch" and make sure the q-agt service is enabled in

+# ENABLED_SERVICES.

+#

+# With Quantum networking the NET_MAN variable is ignored.

+

 # MySQL & RabbitMQ

 # ----------------

@@ -270,6 +289,42 @@ read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."

 # Glance connection info.  Note the port must be specified.

 GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}

+# SWIFT

+# -----

+# TODO: implement glance support

+# TODO: add logging to different location.

+

+# By default the location of swift drives and objects is located inside

+# the swift source directory. SWIFT_DATA_LOCATION variable allow you to redefine

+# this.

+SWIFT_DATA_LOCATION=${SWIFT_DATA_LOCATION:-${SWIFT_DIR}/data}

+

+# We are going to have the configuration files inside the source

+# directory, change SWIFT_CONFIG_LOCATION if you want to adjust that.

+SWIFT_CONFIG_LOCATION=${SWIFT_CONFIG_LOCATION:-${SWIFT_DIR}/config}

+

+# devstack will create a loop-back disk formatted as XFS to store the

+# swift data. By default the disk size is 1 gigabyte. The variable

+# SWIFT_LOOPBACK_DISK_SIZE specified in bytes allow you to change

+# that.

+SWIFT_LOOPBACK_DISK_SIZE=${SWIFT_LOOPBACK_DISK_SIZE:-1000000}

+

+# The ring uses a configurable number of bits from a path’s MD5 hash as

+# a partition index that designates a device. The number of bits kept

+# from the hash is known as the partition power, and 2 to the partition

+# power indicates the partition count. Partitioning the full MD5 hash

+# ring allows other parts of the cluster to work in batches of items at

+# once which ends up either more efficient or at least less complex than

+# working with each item separately or the entire cluster all at once.

+# By default we define 9 for the partition count (which mean 512).

+SWIFT_PARTITION_POWER_SIZE=${SWIFT_PARTITION_POWER_SIZE:-9}

+

+# We only ask for Swift Hash if we have enabled swift service.

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

+    # SWIFT_HASH is a random unique string for a swift cluster that

+    # can never change.

+    read_password SWIFT_HASH "ENTER A RANDOM SWIFT HASH."

+fi

 # Keystone

 # --------

@@ -283,7 +338,7 @@ read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR HORIZON AND KEYSTONE (

 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.

+# first error that occurred.

 trap failed ERR

 failed() {

     local r=$?

@@ -310,7 +365,7 @@ fi

 # install apt requirements

 apt_get update

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

+apt_get install `cat $FILES/apts/* | cut -d\# -f1 | grep -Ev "mysql-server|rabbitmq-server|memcached"`

 # install python requirements

 sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install `cat $FILES/pips/*`

@@ -349,6 +404,10 @@ function git_clone {

 # compute service

 git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH

+# storage service

+git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH

+# swift + keystone middleware

+git_clone $SWIFT_KEYSTONE_REPO $SWIFT_KEYSTONE_DIR $SWIFT_KEYSTONE_BRANCH

 # image catalog service

 git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH

 # unified auth system (manages accounts/tokens)

@@ -362,6 +421,8 @@ git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH

 # openstackx is a collection of extensions to openstack.compute & nova

 # that is *deprecated*.  The code is being moved into python-novaclient & nova.

 git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH

+# quantum

+git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH

 # Initialization

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

@@ -370,12 +431,15 @@ git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH

 # setup our checkouts so they are installed into python path

 # allowing ``import nova`` or ``import glance.client``

 cd $KEYSTONE_DIR; sudo python setup.py develop

+cd $SWIFT_DIR; sudo python setup.py develop

+cd $SWIFT_KEYSTONE_DIR; sudo python setup.py develop

 cd $GLANCE_DIR; sudo python setup.py develop

 cd $NOVACLIENT_DIR; sudo python setup.py develop

 cd $NOVA_DIR; sudo python setup.py develop

 cd $OPENSTACKX_DIR; sudo python setup.py develop

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

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

+cd $QUANTUM_DIR; 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

@@ -500,13 +564,12 @@ fi

 # ----

 if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then

-    # We are going to use the sample http middleware configuration from the

-    # keystone project to launch nova.  This paste config adds the configuration

-    # required for nova to validate keystone tokens - except we need to switch

-    # the config to use our service token instead (instead of the invalid token

-    # 999888777666).

-    cp $KEYSTONE_DIR/examples/paste/nova-api-paste.ini $NOVA_DIR/bin

-    sed -e "s,999888777666,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini

+    # We are going to use a sample http middleware configuration based on the

+    # one from the keystone project to launch nova.  This paste config adds

+    # the configuration required for nova to validate keystone tokens. We add

+    # our own service token to the configuration.

+    cp $FILES/nova-api-paste.ini $NOVA_DIR/bin

+    sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini

 fi

 if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then

@@ -580,6 +643,129 @@ if [[ "$ENABLED_SERVICES" =~ "n-net" ]]; then

     mkdir -p $NOVA_DIR/networks

 fi

+# Storage Service

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

+    # We first do a bit of setup by creating the directories and

+    # changing the permissions so we can run it as our user.

+

+    USER_GROUP=$(id -g)

+    sudo mkdir -p ${SWIFT_DATA_LOCATION}/drives

+    sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_LOCATION}/drives

+

+    # We then create a loopback disk and format it to XFS.

+    if [[ ! -e ${SWIFT_DATA_LOCATION}/drives/images/swift.img ]];then

+        mkdir -p  ${SWIFT_DATA_LOCATION}/drives/images

+        sudo touch  ${SWIFT_DATA_LOCATION}/drives/images/swift.img

+        sudo chown $USER: ${SWIFT_DATA_LOCATION}/drives/images/swift.img

+

+        dd if=/dev/zero of=${SWIFT_DATA_LOCATION}/drives/images/swift.img \

+            bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}

+        mkfs.xfs -f -i size=1024  ${SWIFT_DATA_LOCATION}/drives/images/swift.img

+    fi

+

+    # After the drive being created we mount the disk with a few mount

+    # options to make it most efficient as possible for swift.

+    mkdir -p ${SWIFT_DATA_LOCATION}/drives/sdb1

+    if ! egrep -q ${SWIFT_DATA_LOCATION}/drives/sdb1 /proc/mounts;then

+        sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8  \

+            ${SWIFT_DATA_LOCATION}/drives/images/swift.img ${SWIFT_DATA_LOCATION}/drives/sdb1

+    fi

+

+    # We then create link to that mounted location so swift would know

+    # where to go.

+    for x in {1..4}; do sudo ln -sf ${SWIFT_DATA_LOCATION}/drives/sdb1/$x ${SWIFT_DATA_LOCATION}/$x; done

+

+    # We now have to emulate a few different servers into one we

+    # create all the directories needed for swift

+    tmpd=""

+    for d in ${SWIFT_DATA_LOCATION}/drives/sdb1/{1..4} \

+        ${SWIFT_CONFIG_LOCATION}/{object,container,account}-server \

+        ${SWIFT_DATA_LOCATION}/{1..4}/node/sdb1 /var/run/swift ;do

+        [[ -d $d ]] && continue

+        sudo install -o ${USER} -g $USER_GROUP -d $d

+    done

+

+   # We do want to make sure this is all owned by our user.

+   sudo chown -R $USER: ${SWIFT_DATA_LOCATION}/{1..4}/node

+   sudo chown -R $USER: ${SWIFT_CONFIG_LOCATION}

+

+   # swift-init has a bug using /etc/swift until bug #885595 is fixed

+   # we have to create a link

+   sudo ln -s ${SWIFT_CONFIG_LOCATION} /etc/swift

+

+   # Swift use rsync to syncronize between all the different

+   # partitions (which make more sense when you have a multi-node

+   # setup) we configure it with our version of rsync.

+   sed -e "s/%GROUP%/${USER_GROUP}/;s/%USER%/$USER/;s,%SWIFT_DATA_LOCATION%,$SWIFT_DATA_LOCATION," $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf

+   sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync

+

+   # By default Swift will be installed with the tempauth middleware

+   # which has some default username and password if you have

+   # configured keystone it will checkout the directory.

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

+       swift_auth_server=keystone

+       # We need a special version of bin/swift which understand the

+       # OpenStack api 2.0, we download it until this is getting

+       # integrated in swift.

+       sudo curl -s -o/usr/local/bin/swift \

+           'https://review.openstack.org/gitweb?p=openstack/swift.git;a=blob_plain;f=bin/swift;hb=48bfda6e2fdf3886c98bd15649887d54b9a2574e'

+   else

+       swift_auth_server=tempauth

+   fi

+

+   # We do the install of the proxy-server and swift configuration

+   # replacing a few directives to match our configuration.

+   sed "s,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;s/%USER%/$USER/;s/%SERVICE_TOKEN%/${SERVICE_TOKEN}/;s/%AUTH_SERVER%/${swift_auth_server}/" \

+       $FILES/swift/proxy-server.conf|sudo tee  ${SWIFT_CONFIG_LOCATION}/proxy-server.conf

+

+   sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift/swift.conf > ${SWIFT_CONFIG_LOCATION}/swift.conf

+

+   # We need to generate a object/account/proxy configuration

+   # emulating 4 nodes on different ports we have a little function

+   # that help us doing that.

+   function generate_swift_configuration() {

+       local server_type=$1

+       local bind_port=$2

+       local log_facility=$3

+       local node_number

+

+       for node_number in {1..4};do

+           node_path=${SWIFT_DATA_LOCATION}/${node_number}

+           sed -e "s,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;s,%USER%,$USER,;s,%NODE_PATH%,${node_path},;s,%BIND_PORT%,${bind_port},;s,%LOG_FACILITY%,${log_facility}," \

+               $FILES/swift/${server_type}-server.conf > ${SWIFT_CONFIG_LOCATION}/${server_type}-server/${node_number}.conf

+           bind_port=$(( ${bind_port} + 10 ))

+           log_facility=$(( ${log_facility} + 1 ))

+       done

+   }

+   generate_swift_configuration object 6010 2

+   generate_swift_configuration container 6011 2

+   generate_swift_configuration account 6012 2

+

+   # We create two helper scripts :

+   #

+   # - swift-remakerings

+   #   Allow to recreate rings from scratch.

+   # - swift-startmain

+   #   Restart your full cluster.

+   #

+   sed -e "s,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;s/%SWIFT_PARTITION_POWER_SIZE%/$SWIFT_PARTITION_POWER_SIZE/" $FILES/swift/swift-remakerings | \

+       sudo tee /usr/local/bin/swift-remakerings

+   sudo install -m755 $FILES/swift/swift-startmain /usr/local/bin/

+   sudo chmod +x /usr/local/bin/swift-*

+

+   # We then can start rsync.

+   sudo /etc/init.d/rsync restart || :

+

+   # Create our ring for the object/container/account.

+   /usr/local/bin/swift-remakerings

+

+   # And now we launch swift-startmain to get our cluster running

+   # ready to be tested.

+   /usr/local/bin/swift-startmain || :

+

+   unset s swift_hash swift_auth_server tmpd

+fi

+

 # Volume Service

 # --------------

@@ -593,7 +779,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then

     # By default, the backing file is 2G in size, and is stored in /opt/stack.

     #

     if ! sudo vgdisplay | grep -q nova-volumes; then

-        VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-/opt/stack/nova-volumes-backing-file}

+        VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DEST/nova-volumes-backing-file}

         VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}

         truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE

         DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`

@@ -616,8 +802,16 @@ add_nova_flag "--nodaemon"

 add_nova_flag "--allow_admin_api"

 add_nova_flag "--scheduler_driver=$SCHEDULER"

 add_nova_flag "--dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf"

-add_nova_flag "--network_manager=nova.network.manager.$NET_MAN"

 add_nova_flag "--fixed_range=$FIXED_RANGE"

+if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then

+    add_nova_flag "--network_manager=nova.network.quantum.manager.QuantumManager"

+    if [[ "$Q_PLUGIN" = "openvswitch" ]]; then

+        add_nova_flag "--libvirt_vif_type=ethernet"

+        add_nova_flag "--libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver"

+    fi

+else

+    add_nova_flag "--network_manager=nova.network.manager.$NET_MAN"

+fi

 add_nova_flag "--my_ip=$HOST_IP"

 add_nova_flag "--public_interface=$PUBLIC_INTERFACE"

 add_nova_flag "--vlan_interface=$VLAN_INTERFACE"

@@ -632,15 +826,16 @@ add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"

 add_nova_flag "--rabbit_host=$RABBIT_HOST"

 add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"

 add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"

+add_nova_flag "--force_dhcp_release"

 if [ -n "$INSTANCES_PATH" ]; then

     add_nova_flag "--instances_path=$INSTANCES_PATH"

 fi

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

-    add_nova_flag "--multi_host=$MULTI_HOST"

-    add_nova_flag "--send_arp_for_ha=1"

+if [ "$MULTI_HOST" != "False" ]; then

+    add_nova_flag "--multi_host"

+    add_nova_flag "--send_arp_for_ha"

 fi

 if [ "$SYSLOG" != "False" ]; then

-    add_nova_flag "--use_syslog=1"

+    add_nova_flag "--use_syslog"

 fi