Merge "move glance conf dir to /etc/glance"
diff --git a/README.md b/README.md
index 3e57fc3..5c32893 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-Devstack is a set of scripts and utilities to quickly deploy an OpenStack cloud.
+DevStack is a set of scripts and utilities to quickly deploy an OpenStack cloud.
# Goals
-* To quickly build dev OpenStack environments in a clean oneiric environment
+* To quickly build dev OpenStack environments in a clean Oneiric or Precise environment
* 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
@@ -10,23 +10,23 @@
Read more at http://devstack.org (built from the gh-pages branch)
-IMPORTANT: Be sure to carefully read stack.sh and any other scripts you execute before you run them, as they install software and may alter your networking configuration. We strongly recommend that you run stack.sh in a clean and disposable vm when you are first getting started.
+IMPORTANT: Be sure to carefully read `stack.sh` and any other scripts you execute before you run them, as they install software and may alter your networking configuration. We strongly recommend that you run `stack.sh` in a clean and disposable vm when you are first getting started.
# Devstack on Xenserver
-If you would like to use Xenserver as the hypervisor, please refer to the instructions in ./tools/xen/README.md.
+If you would like to use Xenserver as the hypervisor, please refer to the instructions in `./tools/xen/README.md`.
# Versions
-The devstack master branch generally points to trunk versions of OpenStack components. For older, stable versions, look for branches named stable/[release]. For example, you can do the following to create a diablo OpenStack cloud:
+The devstack master branch generally points to trunk versions of OpenStack components. For older, stable versions, look for branches named stable/[release] in the DevStack repo. For example, you can do the following to create a diablo OpenStack cloud:
git checkout stable/diablo
./stack.sh
-Milestone builds are also available in this manner:
+You can also pick specific OpenStack project releases by setting the appropriate `*_BRANCH` variables in `localrc` (look in `stackrc` for the default set). Usually just before a release there will be milestone-proposed branches that need to be tested::
- git checkout essex-3
- ./stack.sh
+ GLANCE_REPO=https://github.com/openstack/glance.git
+ GLANCE_BRANCH=milestone-proposed
# Start A Dev Cloud
@@ -55,22 +55,22 @@
# Customizing
-You can override environment variables used in stack.sh by creating file name 'localrc'. 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.
+You can override environment variables used in `stack.sh` by creating file name `localrc`. 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.
# Swift
-Swift is not installed by default, you can enable easily by adding this to your localrc:
+Swift is not installed by default, you can enable easily by adding this to your `localrc`:
- ENABLED_SERVICE="$ENABLED_SERVICES,swift"
+ ENABLED_SERVICE="$ENABLED_SERVICES,swift"
-If you want a minimal swift install with only swift and keystone you can have this instead in your localrc:
+If you want a minimal Swift install with only Swift and Keystone you can have this instead in your `localrc`:
- ENABLED_SERVICES="key,mysql,swift"
+ ENABLED_SERVICES="key,mysql,swift"
-If you use swift with keystone, Swift will authenticate against it. You will need to make sure to use the keystone URL to auth against.
+If you use Swift with Keystone, Swift will authenticate against it. You will need to make sure to use the Keystone URL to auth against.
-Swift will be acting as a S3 endpoint for keystone so effectively replacing the **nova-objectore**.
+Swift will be acting as a S3 endpoint for Keystone so effectively replacing the `nova-objectstore`.
-Only swift proxy server is launched in the screen session all other services are started in background and managed by **swift-init* tool.
+Only Swift proxy server is launched in the screen session all other services are started in background and managed by `swift-init` tool.
-By default Swift will configure 3 replicas (and one spare) which could be IO intensive on a small vm, if you only want to do some quick testing of the API you can choose to only have one replica by customizing the variable SWIFT_REPLICAS in your localrc.
+By default Swift will configure 3 replicas (and one spare) which could be IO intensive on a small vm, if you only want to do some quick testing of the API you can choose to only have one replica by customizing the variable `SWIFT_REPLICAS` in your `localrc`.
diff --git a/stack.sh b/stack.sh
index 205567d..fa59769 100755
--- a/stack.sh
+++ b/stack.sh
@@ -888,8 +888,8 @@
# for Nova to validate Keystone tokens.
# Allow rate limiting to be turned off for testing, like for Tempest
- # NOTE: Set OSAPI_RATE_LIMIT=" " to turn OFF rate limiting
- OSAPI_RATE_LIMIT=${OSAPI_RATE_LIMIT:-"ratelimit"}
+ # NOTE: Set API_RATE_LIMIT="False" to turn OFF rate limiting
+ API_RATE_LIMIT=${API_RATE_LIMIT:-"True"}
# Remove legacy paste config if present
rm -f $NOVA_DIR/bin/nova-api-paste.ini
@@ -1325,10 +1325,14 @@
if [ "$SYSLOG" != "False" ]; then
add_nova_opt "use_syslog=True"
fi
+if [ "$API_RATE_LIMIT" != "True" ]; then
+ add_nova_opt "api_rate_limit=False"
+fi
+
# Provide some transition from EXTRA_FLAGS to EXTRA_OPTS
if [[ -z "$EXTRA_OPTS" && -n "$EXTRA_FLAGS" ]]; then
- EXTRA_OPTS=$EXTRA_FLAGS
+ EXTRA_OPTS=$EXTRA_FLAGS
fi
# You can define extra nova conf flags by defining the array EXTRA_OPTS,
diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index 0462796..5fa7aa8 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -10,7 +10,10 @@
# This directory
TOP_DIR=$(cd $(dirname "$0") && pwd)
-# Source params - override xenrc params in your localrc to suite your taste
+# Source lower level functions
+. $TOP_DIR/../../functions
+
+# Source params - override xenrc params in your localrc to suit your taste
source xenrc
# Echo commands
@@ -134,17 +137,8 @@
SR_UUID=`xe sr-list --minimal name-label="Local storage"`
xe sr-param-set uuid=$SR_UUID other-config:i18n-key=local-storage
-# Clean nova if desired
-if [ "$CLEAN" = "1" ]; then
- rm -rf $TOP_DIR/nova
-fi
-
# Checkout nova
-if [ ! -d $TOP_DIR/nova ]; then
- env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
- cd $TOP_DIR/nova
- git checkout $NOVA_BRANCH
-fi
+git_clone $NOVA_REPO $TOP_DIR/nova $NOVA_BRANCH
# Install plugins
cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/
diff --git a/tools/xen/prepare_dom0.sh b/tools/xen/prepare_dom0.sh
index 49988bd..71e9d6d 100755
--- a/tools/xen/prepare_dom0.sh
+++ b/tools/xen/prepare_dom0.sh
@@ -35,7 +35,7 @@
fi
# Clone devstack
-DEVSTACK=${DEVSTACKROOT:/root/devstack}
+DEVSTACK=${DEVSTACKROOT:-"/root/devstack"}
if [ ! -d $DEVSTACK ]; then
git clone git://github.com/openstack-dev/devstack.git $DEVSTACK
fi
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index 73f9c02..58fda31 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -36,7 +36,7 @@
MGT_DEV=${MGT_DEV:-eth0}
# XVA Directory
-XVA_DIR=${XVA_DIR:-xvas}
+XVA_DIR=${XVA_DIR:-`pwd`/xvas}
# Path to xva file
XVA=${XVA:-$XVA_DIR/$GUEST_NAME.xva }