commit ba31305497fe66ee01230659bc6778915c873616
author Chmouel Boudjnah <chmouel@enovance.com> Wed Jul 10 21:03:43 2013 +0200
committer Chmouel Boudjnah <chmouel@enovance.com> Thu Jul 11 00:01:03 2013 +0200
tree 657f99f2e278aa617108fbacf093560016a0a76f
parent 0ce91a5cba10e3a68dad29f9a86f774ee6cfe7b7

Move swift stuff out of keystone-data.sh

- Fixes bug 1199918.

Change-Id: I808bdd74a94c8e0ca126b9bee1bfd53eafa189a9

files/keystone_data.sh

diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index ccac880..45f9c81 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -5,7 +5,6 @@
 # Tenant               User       Roles
 # ------------------------------------------------------------------
 # service              glance     admin
-# service              swift      service        # if enabled
 # service              heat       service        # if enabled
 # service              ceilometer admin          # if enabled
 # Tempest Only:
@@ -124,32 +123,7 @@
     fi
 fi
 
-# Swift
-
-if [[ "$ENABLED_SERVICES" =~ "swift" || "$ENABLED_SERVICES" =~ "s-proxy" ]]; then
-    SWIFT_USER=$(get_id keystone user-create \
-        --name=swift \
-        --pass="$SERVICE_PASSWORD" \
-        --tenant_id $SERVICE_TENANT \
-        --email=swift@example.com)
-    keystone user-role-add \
-        --tenant_id $SERVICE_TENANT \
-        --user_id $SWIFT_USER \
-        --role_id $SERVICE_ROLE
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        SWIFT_SERVICE=$(get_id keystone service-create \
-            --name=swift \
-            --type="object-store" \
-            --description="Swift Service")
-        keystone endpoint-create \
-            --region RegionOne \
-            --service_id $SWIFT_SERVICE \
-            --publicurl "http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s" \
-            --adminurl "http://$SERVICE_HOST:8080" \
-            --internalurl "http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s"
-    fi
-fi
-
+# Ceilometer
 if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then
     CEILOMETER_USER=$(get_id keystone user-create --name=ceilometer \
                                               --pass="$SERVICE_PASSWORD" \