summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-09-03 14:36:53 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-09-03 14:36:53 +0200
commitc160d2a552ae2d05a3931b688efe4bbc042f153d (patch)
tree7738029cb9c0350400adc9c9bd5aa2bed4a4d73a
parente78393f83a78ec48808fc0540f9e64f978b327a6 (diff)
lavalab-gen.py: replace slave_name by worker_name
In the board loop, the slave name is stored in slave_name, but some code after use worker_name. This works when only one slave exists, but fail when it exists multiple slave. This patch replace slave_name by worker_name for being consistent with the naming used in the rest of code.
-rwxr-xr-xlavalab-gen.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 597bd1a..0af6fd3 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -331,29 +331,29 @@ def main():
for board in boards:
board_name = board["name"]
if "slave" in board:
- slave_name = board["slave"]
+ worker_name = board["slave"]
else:
- slave_name = default_slave
- print("\tFound %s on %s" % (board_name, slave_name))
+ worker_name = default_slave
+ print("\tFound %s on %s" % (board_name, worker_name))
found_slave = False
for fs in workers["slaves"]:
- if fs["name"] == slave_name:
+ if fs["name"] == worker_name:
slave = fs
found_slave = True
if not found_slave:
- print("Cannot find slave %s" % slave_name)
+ print("Cannot find slave %s" % worker_name)
sys.exit(1)
if not "host" in slave:
host = "local"
else:
host = slave["host"]
- workerdir = "output/%s/%s" % (host, slave_name)
+ workerdir = "output/%s/%s" % (host, worker_name)
dockcomposeymlpath = "output/%s/docker-compose.yml" % host
fp = open(dockcomposeymlpath, "r")
dockcomp = yaml.load(fp)
fp.close()
device_path = "%s/devices/" % workerdir
- devices_path = "%s/devices/%s" % (workerdir, slave_name)
+ devices_path = "%s/devices/%s" % (workerdir, worker_name)
devicetype = board["type"]
device_line = template_device.substitute(devicetype=devicetype)
if "pdu_generic" in board: