commit 6dd8a8bee402a6be683075e0669a010a279950ae
author Gael Chamoulaud <gchamoul@redhat.com> Tue Jul 22 01:12:12 2014 +0200
committer Gael Chamoulaud <gchamoul@redhat.com> Tue Jul 22 17:29:04 2014 +0200
tree 863dda081a4cf9cbf78f911ac66178b7ffc9f11e
parent 2bb05fdb84aa472299efc714b7c1114a25a3ada2

Users in service group should not have email addresses

Change-Id: Ieed9dffce5cf1e735e482dd3494ac1e103b50955
Closes-Bug: 1185201
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>

functions-common

diff --git a/functions-common b/functions-common
index 9093952..4b660de 100644
--- a/functions-common
+++ b/functions-common
@@ -723,8 +723,13 @@
 }
 
 # Gets or creates user
-# Usage: get_or_create_user <username> <password> <project> <email>
+# Usage: get_or_create_user <username> <password> <project> [<email>]
 function get_or_create_user {
+    if [[ ! -z "$4" ]]; then
+        local EMAIL="--email=$4"
+    else
+        local EMAIL=""
+    fi
     # Gets user id
     USER_ID=$(
         # Gets user id
@@ -734,7 +739,7 @@
             $1 \
             --password "$2" \
             --project $3 \
-            --email $4 \
+            $EMAIL \
             -f value -c id
     )
     echo $USER_ID