Merge "Added tgtadm to sudo cmd list. Fixes bug 927924."
diff --git a/README.md b/README.md
index a185f34..34eb45f 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
* 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
+* To sanity-check OpenStack builds (used in gating commits to the primary repos)
Read more at http://devstack.org (built from the gh-pages branch)
@@ -13,13 +14,19 @@
# Versions
-The devstack master branch generally points to trunk versions of OpenStack components. For older, stable versions, look for branches named stable/[mil
-estone]. 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]. For example, you can do the following to create a diablo OpenStack cloud:
git checkout stable/diablo
./stack.sh
-# To start a dev cloud (Installing in a dedicated, disposable vm is safer than installing on your dev machine!):
+Milestone builds are also available in this manner:
+
+ git checkout essex-3
+ ./stack.sh
+
+# Start A Dev Cloud
+
+Installing in a dedicated disposable vm is safer than installing on your dev machine! To start a dev cloud:
./stack.sh
@@ -40,3 +47,13 @@
# 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.
+
+# Swift
+
+Swift is not installed by default, you need to add the **swift** keyword in the ENABLED_SERVICES variable to get it installed.
+
+If you have keystone enabled, Swift will authenticate against it, make sure to use the keystone URL to auth against.
+
+At this time Swift is not started in a screen session but as daemon you need to use the **swift-init** CLI to manage the swift daemons.
+
+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/exercises/swift.sh b/exercises/swift.sh
index 3a57744..95443df 100755
--- a/exercises/swift.sh
+++ b/exercises/swift.sh
@@ -23,22 +23,18 @@
# Testing Swift
# =============
-# FIXME(chmou): when review https://review.openstack.org/#change,3712
-# is merged we would be able to use the common openstack options and
-# remove the trailing slash to v2.0 auth url.
-#
# Check if we have to swift via keystone
-swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0/ -U admin -K $ADMIN_PASSWORD stat
+swift stat
# We start by creating a test container
-swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0/ -U admin -K $ADMIN_PASSWORD post testcontainer
+swift post testcontainer
# add some files into it.
-swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0/ -U admin -K $ADMIN_PASSWORD upload testcontainer /etc/issue
+swift upload testcontainer /etc/issue
# list them
-swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0/ -U admin -K $ADMIN_PASSWORD list testcontainer
+swift list testcontainer
# And we may want to delete them now that we have tested that
# everything works.
-swift --auth-version 2 -A http://${HOST_IP}:5000/v2.0/ -U admin -K $ADMIN_PASSWORD delete testcontainer
+swift delete testcontainer