commit ecdd8fc6ba872f7615bf78a1df71e3dc7d8e1d23
author Chmouel Boudjnah <chmouel@chmouel.com> Mon Mar 19 13:50:45 2012 +0000
committer Chmouel Boudjnah <chmouel@chmouel.com> Mon Mar 19 16:55:04 2012 +0000
tree 18a4d18ba644bcaaaa78c1c4b7c8db69663177eb
parent 6aef757432595ec4aa318c20246bf1d6aaf681db

Remove service_ and admin_token.

- Remove cache = swift.cache as well from swift config as not needed as
  well.

Change-Id: I39f0b7ed48e6ee8926cdc011a46fdd2d01880a89

stack.sh

diff --git a/stack.sh b/stack.sh
index 6c12c96..452eb2f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1079,7 +1079,7 @@
    # which has some default username and password if you have
    # configured keystone it will checkout the directory.
    if is_service_enabled key; then
-       swift_auth_server="s3token tokenauth keystone"
+       swift_auth_server="s3token authtoken keystone"
    else
        swift_auth_server=tempauth
    fi
@@ -1092,6 +1092,7 @@
        s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g;
        s,%SERVICE_USERNAME%,swift,g;
        s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;
+       s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;
        s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g;
        s,%KEYSTONE_SERVICE_PORT%,${KEYSTONE_SERVICE_PORT},g;
        s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g;