From b18c3454b16a4b01155daaaa54c6663cf9498121 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 7 Nov 2017 15:06:49 +0100 Subject: Place board under boardlist We need to add some information to lab node, so we need to move all boards under a list("boardlist") --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index b8bb503..c92febe 100644 --- a/README.md +++ b/README.md @@ -23,15 +23,16 @@ A sample dhcpd config file is available in the dhcpd directory This file describe how are setuped your boards, and how they are connected and powered. ``` lab-slave-name: - devicename: - type: the devicetype of this device - pdu: - daemon: The hostname running the PDU daemon (always localhost) - host: The host name of the PDU as named in lavapdu.conf - port: portnumber (The port number of the PDU where the device is connected) - uart: - type: - serial: The serial number in case of FTDI uart + boardlist: + devicename: + type: the devicetype of this device + pdu: + daemon: The hostname running the PDU daemon (always localhost) + host: The host name of the PDU as named in lavapdu.conf + port: portnumber (The port number of the PDU where the device is connected) + uart: + type: + serial: The serial number in case of FTDI uart ``` Notes: uart FTDI only need serial -- cgit 1.2.3-korg From ffce31d5f3e13d9d3f952b14624883ca88538168 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 7 Nov 2017 15:12:43 +0100 Subject: Permit to customize dispatcher_ip dispatcher_ip is the IP used by boards for contacting/downloading images/dtb/etc... For the moment it was harcoded to 192.168.66.1. This patch permit to easily change it. --- README.md | 1 + lavalab-gen.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index c92febe..c4a3cec 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ A sample dhcpd config file is available in the dhcpd directory This file describe how are setuped your boards, and how they are connected and powered. ``` lab-slave-name: + dispatcher_ip: the IP where the slave could be contacted. In lava-docker it is the host IP since docker proxify TFTP from host to the slave. boardlist: devicename: type: the devicetype of this device diff --git a/lavalab-gen.py b/lavalab-gen.py index 6c1cb0f..49203ec 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -97,11 +97,12 @@ def main(args): fp = open("lavalab-udev-%s.rules" % lab_name, "w") fp.write(udev_line) fp.close() - if not os.path.isdir("lava-master/slaves/"): - os.mkdir("lava-master/slaves/") - fp = open("lava-master/slaves/%s.yaml" % lab_name, "w") - fp.write("dispatcher_ip: 192.168.66.1") - fp.close() + if lab.has_key("dispatcher_ip"): + if not os.path.isdir("lava-master/slaves/"): + os.mkdir("lava-master/slaves/") + fp = open("lava-master/slaves/%s.yaml" % lab_name, "w") + fp.write("dispatcher_ip: %s" % lab["dispatcher_ip"]) + fp.close() #now proceed with tokens fp = open(tokens_yaml, "r") -- cgit 1.2.3-korg From d7b3ab2ca280c8ee1dafb4773bf979b805debf0a Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 7 Nov 2017 15:54:59 +0100 Subject: Change misleading lab-slave-name example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index c4a3cec..e0fb466 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ A sample dhcpd config file is available in the dhcpd directory ### boards.yaml This file describe how are setuped your boards, and how they are connected and powered. ``` -lab-slave-name: +lab-slave-XX: dispatcher_ip: the IP where the slave could be contacted. In lava-docker it is the host IP since docker proxify TFTP from host to the slave. boardlist: devicename: -- cgit 1.2.3-korg