summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-07-24 07:55:15 -0500
committerGitHub <noreply@github.com>2018-07-24 07:55:15 -0500
commitbaf680990ecb539cde0a16ef5b32a7321dd4538a (patch)
tree5362228f4a266208bacb24f441c9b4c611563388
parentef276f04512f1808ae7e9fbb2e3b904855486462 (diff)
parent76a084e4d15a1bdd95747d59bd7ffe00cc78f747 (diff)
Merge pull request #35 from montjoie/token_fix
lavalab-gen.py: token is optional for users
-rw-r--r--README.md2
-rwxr-xr-xlava-master/scripts/setup.sh2
-rwxr-xr-xlavalab-gen.py5
3 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index 66bec8f..4ef1019 100644
--- a/README.md
+++ b/README.md
@@ -221,7 +221,7 @@ masters:
persistent_db: True/False (default False) Is the postgres DB is persistent over reboot
users:
- name: LAVA username
- token: The token of this user
+ token: The token of this user (optional)
password: Password the this user (generated if not provided)
superuser: yes/no (default no)
staff: yes/no (default no)
diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh
index c7807dc..dd0d58f 100755
--- a/lava-master/scripts/setup.sh
+++ b/lava-master/scripts/setup.sh
@@ -29,6 +29,7 @@ if [ -e /root/lava-users ];then
USER_OPTION=""
STAFF=0
SUPERUSER=0
+ TOKEN=""
. /root/lava-users/$ut
if [ -z "$PASSWORD" -o "$PASSWORD" = "$TOKEN" ];then
echo "Generating password..."
@@ -48,6 +49,7 @@ if [ -e /root/lava-users ];then
echo "Adding username $USER DEBUG(with $TOKEN / $PASSWORD / $USER_OPTION)"
lava-server manage users add --passwd $PASSWORD $USER_OPTION $USER || exit 1
if [ ! -z "$TOKEN" ];then
+ echo "Adding token to user $USER"
lava-server manage tokens add --user $USER --secret $TOKEN || exit 1
fi
fi
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 8f55670..7596818 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -159,8 +159,9 @@ def main():
print("WARNING: unknown keyword %s" % keyword)
username = user["name"]
ftok = open("%s/%s" % (userdir, username), "w")
- token = user["token"]
- ftok.write("TOKEN=" + token + "\n")
+ if "token" in user:
+ token = user["token"]
+ ftok.write("TOKEN=" + token + "\n")
if "password" in user:
password = user["password"]
ftok.write("PASSWORD=" + password + "\n")