summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-09-03 14:42:37 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-09-03 14:42:37 +0200
commite21ccee9df4afba55811e58e3d6943a076a56154 (patch)
tree02ded8d0b9ca7277815015ddd7dc2e2d35d17d93
parentc160d2a552ae2d05a3931b688efe4bbc042f153d (diff)
lavalab-gen.py: default_slave is a valid keyword
default_slave was not in valid keyword and thus generate a warning. This patch set it as valid and document it in the mean time.
-rw-r--r--README.md1
-rwxr-xr-xlavalab-gen.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index a3364b4..678fddb 100644
--- a/README.md
+++ b/README.md
@@ -242,6 +242,7 @@ slaves:
remote_rpc_port: the port used by the LAVA RPC2 (default 80)
remote_user: the user used for connecting to the master
remote_proto: http(default) or https
+ default_slave: Does this slave is the default slave where to add boards (default: lab-slave-0)
extra_actions: An optional list of action to do at end of the docker build
- "apt-get install package"
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 0af6fd3..b327813 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -219,7 +219,7 @@ def main():
sys.exit(1)
slaves = workers["slaves"]
for slave in slaves:
- keywords_slaves = [ "name", "host", "dispatcher_ip", "remote_user", "remote_master", "remote_address", "remote_rpc_port", "remote_proto", "extra_actions", "zmq_auth_key", "zmq_auth_key_secret" ]
+ keywords_slaves = [ "name", "host", "dispatcher_ip", "remote_user", "remote_master", "remote_address", "remote_rpc_port", "remote_proto", "extra_actions", "zmq_auth_key", "zmq_auth_key_secret", "default_slave" ]
for keyword in slave:
if not keyword in keywords_slaves:
print("WARNING: unknown keyword %s" % keyword)