From 421d3fa4c324e56626f666bfbc6f115c2604ee03 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sun, 28 Dec 2014 15:42:28 +0100
Subject: [PATCH] Reorder keystone (part 2) to match Juno

Reorder keystone (part 2) to match the Juno install-guide. No functional
changes.

Change-Id: I480e0a67103e4638c1729868cbce1e98e6184dd4
---
 labs/scripts/ubuntu/setup_keystone.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/labs/scripts/ubuntu/setup_keystone.sh b/labs/scripts/ubuntu/setup_keystone.sh
index ecbf2746..e7e0f144 100755
--- a/labs/scripts/ubuntu/setup_keystone.sh
+++ b/labs/scripts/ubuntu/setup_keystone.sh
@@ -70,7 +70,7 @@ fi
 
 #------------------------------------------------------------------------------
 # Configure keystone users, tenants and roles
-# http://docs.openstack.org/icehouse/install-guide/install/apt/content/keystone-users.html
+# http://docs.openstack.org/juno/install-guide/install/apt/content/keystone-users.html
 #------------------------------------------------------------------------------
 
 echo "Using OS_SERVICE_TOKEN, OS_SERVICE_ENDPOINT for authentication."
@@ -82,19 +82,19 @@ until keystone user-list >/dev/null 2>&1; do
     sleep 1
 done
 
+echo "Adding admin tenant."
+keystone tenant-create --name "$ADMIN_TENANT_NAME" --description "Admin Tenant"
+
 echo "Creating admin user."
 keystone user-create --name "$ADMIN_USER_NAME" --pass "$ADMIN_PASSWORD" --email "admin@$MAIL_DOMAIN"
 
 echo "Creating admin roles."
 keystone role-create --name "$ADMIN_ROLE_NAME"
 
-echo "Adding admin tenant."
-keystone tenant-create --name "$ADMIN_TENANT_NAME" --description "Admin Tenant"
-
 echo "Linking admin user, admin role and admin tenant."
 keystone user-role-add \
-    --tenant "$ADMIN_TENANT_NAME" \
     --user "$ADMIN_USER_NAME" \
+    --tenant "$ADMIN_TENANT_NAME" \
     --role "$ADMIN_ROLE_NAME"
 
 echo "Linking admin user, _member_ role, and admin tenant."
@@ -103,12 +103,12 @@ keystone user-role-add \
     --user "$ADMIN_USER_NAME" \
     --role "$MEMBER_ROLE_NAME"
 
-echo "Creating demo user."
-keystone user-create --name "$DEMO_USER_NAME" --pass "$DEMO_PASSWORD" --email "demo@$MAIL_DOMAIN"
-
 echo "Creating demo tenant."
 keystone tenant-create --name "$DEMO_TENANT_NAME" --description "Demo Tenant"
 
+echo "Creating demo user."
+keystone user-create --name "$DEMO_USER_NAME" --pass "$DEMO_PASSWORD" --email "demo@$MAIL_DOMAIN"
+
 echo "Linking the demo user, _member_ role, and demo tenant."
 keystone user-role-add \
     --tenant "$DEMO_TENANT_NAME" \