summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-09-18 11:34:36 +0200
committerCorentin LABBE <clabbe@baylibre.com>2019-09-19 11:50:22 +0200
commitadf687abc9f9d9d3d114dcaa1208e52b4d88f446 (patch)
treeab349a1231dd4a28b89180a95fab39eb7e0a7dfa
parentd731046b2d8e0168a67b3f59c4706007488a4390 (diff)
Permit to not export NBD port
When doing a qemu-only slave, there are no need of NBD. This patch adds a use_nbd option.
-rw-r--r--README.md1
-rwxr-xr-xlavalab-gen.py10
2 files changed, 9 insertions, 2 deletions
diff --git a/README.md b/README.md
index 46c8373..f43a669 100644
--- a/README.md
+++ b/README.md
@@ -268,6 +268,7 @@ slaves:
default_slave: Does this slave is the default slave where to add boards (default: lab-slave-0)
bind_dev: Bind /dev from host to slave. This is needed when using some HID PDU
use_tftp: Does LAVA need a TFTP server (default True)
+ use_nbd: Does LAVA need a NBD server (default True)
use_nfs: Does the LAVA dispatcher will run NFS jobs
use_tap: Does TAP netdevices could be used
arch: The arch of the worker (if not x86_64), only accept arm64
diff --git a/lavalab-gen.py b/lavalab-gen.py
index cb76e50..58d57a5 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -304,7 +304,7 @@ def main():
else:
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", "default_slave", "export_ser2net", "expose_ser2net", "remote_user_token", "zmq_auth_master_key", "expose_ports", "env", "bind_dev", "loglevel", "use_nfs", "arch", "devices", "lava-coordinator", "use_tap", "host_healthcheck", "use_tftp" ]
+ 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", "export_ser2net", "expose_ser2net", "remote_user_token", "zmq_auth_master_key", "expose_ports", "env", "bind_dev", "loglevel", "use_nfs", "arch", "devices", "lava-coordinator", "use_tap", "host_healthcheck", "use_tftp", "use_nbd" ]
for keyword in slave:
if not keyword in keywords_slaves:
print("WARNING: unknown keyword %s" % keyword)
@@ -334,7 +334,7 @@ def main():
dockcomp["services"][name] = {}
dockcomp["services"][name]["hostname"] = name
dockcomp["services"][name]["dns_search"] = ""
- dockcomp["services"][name]["ports"] = [ "80:80", "61950-62000:61950-62000" ]
+ dockcomp["services"][name]["ports"] = [ "80:80" ]
dockcomp["services"][name]["volumes"] = [ "/boot:/boot", "/lib/modules:/lib/modules" ]
dockcomp["services"][name]["environment"] = {}
dockcomp["services"][name]["build"] = {}
@@ -479,6 +479,12 @@ def main():
use_tftp = worker["use_tftp"]
if use_tftp:
dockcomp["services"][name]["ports"].append("69:69/udp")
+ # TODO permit to change the range of NBD ports
+ use_nbd = True
+ if "use_nbd" in worker:
+ use_nbd = worker["use_nbd"]
+ if use_nbd:
+ dockcomp["services"][name]["ports"].append("61950-62000:61950-62000")
use_nfs = False
if "use_nfs" in worker:
use_nfs = worker["use_nfs"]