@@ -520,6 +520,11 @@ function create_swift_disk() {

 # swifttenanttest2   swiftusertest2     admin

 function create_swift_accounts() {

+    # Defines specific passwords used by tools/create_userrc.sh

+    SWIFTUSERTEST1_PASSWORD=testing

+    SWIFTUSERTEST2_PASSWORD=testing2

+    SWIFTUSERTEST3_PASSWORD=testing3

+

     KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}

     SERVICE_TENANT=$(keystone tenant-list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")

@@ -542,17 +547,17 @@ function create_swift_accounts() {

     SWIFT_TENANT_TEST1=$(keystone tenant-create --name=swifttenanttest1 | grep " id " | get_field 2)

     die_if_not_set $LINENO SWIFT_TENANT_TEST1 "Failure creating SWIFT_TENANT_TEST1"

-    SWIFT_USER_TEST1=$(keystone user-create --name=swiftusertest1 --pass=testing --email=test@example.com | grep " id " | get_field 2)

+    SWIFT_USER_TEST1=$(keystone user-create --name=swiftusertest1 --pass=$SWIFTUSERTEST1_PASSWORD --email=test@example.com | grep " id " | get_field 2)

     die_if_not_set $LINENO SWIFT_USER_TEST1 "Failure creating SWIFT_USER_TEST1"

     keystone user-role-add --user-id $SWIFT_USER_TEST1 --role-id $ADMIN_ROLE --tenant-id $SWIFT_TENANT_TEST1

-    SWIFT_USER_TEST3=$(keystone user-create --name=swiftusertest3 --pass=testing3 --email=test3@example.com | grep " id " | get_field 2)

+    SWIFT_USER_TEST3=$(keystone user-create --name=swiftusertest3 --pass=$SWIFTUSERTEST3_PASSWORD --email=test3@example.com | grep " id " | get_field 2)

     die_if_not_set $LINENO SWIFT_USER_TEST3 "Failure creating SWIFT_USER_TEST3"

     keystone user-role-add --user-id $SWIFT_USER_TEST3 --role-id $ANOTHER_ROLE --tenant-id $SWIFT_TENANT_TEST1

     SWIFT_TENANT_TEST2=$(keystone tenant-create --name=swifttenanttest2 | grep " id " | get_field 2)

     die_if_not_set $LINENO SWIFT_TENANT_TEST2 "Failure creating SWIFT_TENANT_TEST2"

-    SWIFT_USER_TEST2=$(keystone user-create --name=swiftusertest2 --pass=testing2 --email=test2@example.com | grep " id " | get_field 2)

+    SWIFT_USER_TEST2=$(keystone user-create --name=swiftusertest2 --pass=$SWIFTUSERTEST2_PASSWORD --email=test2@example.com | grep " id " | get_field 2)

     die_if_not_set $LINENO SWIFT_USER_TEST2 "Failure creating SWIFT_USER_TEST2"

     keystone user-role-add --user-id $SWIFT_USER_TEST2 --role-id $ADMIN_ROLE --tenant-id $SWIFT_TENANT_TEST2

 }

@@ -253,6 +253,14 @@ if [ $MODE != "create" ]; then

             if [ $MODE = one -a "$user_name" != "$USER_NAME" ]; then

                 continue;

             fi

+

+            # Checks for a specific password defined for an user.

+            # Example for an username johndoe:

+            #                     JOHNDOE_PASSWORD=1234

+            eval SPECIFIC_UPASSWORD="\$${USER_NAME^^}_PASSWORD"

+            if [ -n "$SPECIFIC_UPASSWORD" ]; then

+                USER_PASS=$SPECIFIC_UPASSWORD

+            fi

             add_entry "$user_id" "$user_name" "$tenant_id" "$tenant_name" "$USER_PASS"

         done

     done