From 3b41172e2538c0d6d946f87c8cbc4eb035701c01 Mon Sep 17 00:00:00 2001
From: Vu Tran <vu.tran@windriver.com>
Date: Fri, 23 May 2014 22:10:28 -0400
Subject: keystone add user for tempest

To support tempest, modify keystone identity.sh
script to:

* add user with username=alt_demo, tenant=alt_demo,
and password=password into keystone.
* add user "admin" into tenant "demo".

Signed-off-by: Vu Tran <vu.tran@windriver.com>
---
 .../recipes-devtools/python/python-keystone/identity.sh  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
index fcd8898..40cc2b3 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
+++ b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
@@ -41,6 +41,12 @@ if [ $? -eq 1 ]; then
 else
     DEMO_TENANT=$(keystone tenant-get demo | grep " id " | get_field 2)
 fi
+keystone tenant-get alt_demo
+if [ $? -eq 1 ]; then
+    ALT_DEMO_TENANT=$(keystone tenant-create --name=alt_demo | grep " id " | get_field 2)
+else
+    ALT_DEMO_TENANT=$(keystone tenant-get alt_demo | grep " id " | get_field 2)
+fi
 keystone tenant-get $SERVICE_TENANT_NAME
 if [ $? -eq 1 ]; then
     SERVICE_TENANT=$(keystone tenant-create --name=$SERVICE_TENANT_NAME | grep " id " | get_field 2)
@@ -61,6 +67,12 @@ if [ $? -eq 1 ]; then
 else
     DEMO_USER=$(keystone user-get demo | grep " id " | get_field 2)
 fi
+keystone user-get alt_demo
+if [ $? -eq 1 ]; then
+    ALT_DEMO_USER=$(keystone user-create --name=alt_demo --pass="$DEMO_PASSWORD" --email=alt_demo@domain.com --tenant-id=$ALT_DEMO_TENANT | grep " id " | get_field 2)
+else
+    ALT_DEMO_USER=$(keystone user-get alt_demo | grep " id " | get_field 2)
+fi
 keystone user-get nova
 if [ $? -eq 1 ]; then                                                                                                                           
     NOVA_USER=$(keystone user-create --name=nova --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=nova@domain.com | grep " id " | get_field 2)
@@ -135,6 +147,7 @@ keystone role-create --name heat_stack_user
 # Add Roles to Users in Tenants
 keystone user-role-list --user-id $ADMIN_USER --tenant-id $ADMIN_TENANT &> /dev/null
 keystone user-role-add --tenant-id $ADMIN_TENANT --user-id $ADMIN_USER --role-id $ADMIN_ROLE
+keystone user-role-add --tenant-id $DEMO_TENANT --user-id $ADMIN_USER --role-id $ADMIN_ROLE
 
 keystone user-role-list --user-id $NOVA_USER --tenant-id $SERVICE_TENANT &> /dev/null
 keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NOVA_USER --role-id $ADMIN_ROLE
@@ -151,6 +164,9 @@ keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CINDER_USER --role
 keystone user-role-list --user-id $DEMO_USER --tenant-id $DEMO_TENANT &> /dev/null
 keystone user-role-add --tenant-id $DEMO_TENANT --user-id $DEMO_USER --role-id $MEMBER_ROLE
 
+keystone user-role-list --user-id $ALT_DEMO_USER --tenant-id $ALT_DEMO_TENANT &> /dev/null
+keystone user-role-add --tenant-id $ALT_DEMO_TENANT --user-id $ALT_DEMO_USER --role-id $MEMBER_ROLE
+
 keystone user-role-list --user-id $CEILOMETER_USER --tenant_id $SERVICE_TENANT &> /dev/null
 keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CEILOMETER_USER --role-id $ADMIN_ROLE
 keystone user-role-add --tenant_id $SERVICE_TENANT --user_id $CEILOMETER_USER --role-id $RESELLER_ADMIN_ROLE
-- 
cgit v1.2.3-54-g00ecf