Permit to configure email for LAVA users

3 files changed, 9 insertions, 1 deletions

diff --git a/README.md b/README.md
index 30c2313..a3364b4 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,7 @@ masters:
     - name: LAVA username
       token: The token of this user 	(optional)
       password: Password the this user (generated if not provided)
+      email:	email of the user	(optional)
       superuser: yes/no (default no)
       staff: yes/no (default no)
     tokens:
diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh
index e217a96..426876f 100755
--- a/lava-master/scripts/setup.sh
+++ b/lava-master/scripts/setup.sh
@@ -58,6 +58,10 @@ if [ -e /root/lava-users ];then
 				echo "Adding token to user $USER"
 				lava-server manage tokens add --user $USER --secret $TOKEN || exit 1
 			fi
+			if [ ! -z "$EMAIL" ];then
+				echo "Adding email to user $USER"
+				lava-server manage users update --email $EMAIL $USER || exit 1
+			fi
 		fi
 	done
 fi
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 4c77c2b..2d21fe7 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -160,7 +160,7 @@ def main():
                 need_zmq_auth_gen = True
         if "users" in worker:
             for user in worker["users"]:
-                keywords_users = [ "name", "staff", "superuser", "password", "token" ]
+                keywords_users = [ "name", "staff", "superuser", "password", "token", "email" ]
                 for keyword in user:
                     if not keyword in keywords_users:
                         print("WARNING: unknown keyword %s" % keyword)
@@ -173,6 +173,9 @@ def main():
                     password = user["password"]
                     ftok.write("PASSWORD=" + password + "\n")
                     # libyaml convert yes/no to true/false...
+                if "email" in user:
+                    email = user["email"]
+                    ftok.write("EMAIL=" + email + "\n")
                 if "staff" in user:
                     value = user["staff"]
                     if value is True: