summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-09-13 11:16:31 -0700
committerGitHub <noreply@github.com>2018-09-13 11:16:31 -0700
commit53cecb649a6afb33ab6e4309db03ee7b697282d7 (patch)
treee26e0329742d5ef7cf4e0209868f646225d7d747
parent0d143406d41fcd7a4b03a3941cc3a66c294b21b2 (diff)
parent8034ea8a06d29cf148c3170b044385e874e5b7e1 (diff)
Merge pull request #47 from kernelci/fix/zmq
lavalab-gen: fiz zmq key filename assumptions
-rwxr-xr-xlava-slave/scripts/setup.sh1
-rwxr-xr-xlavalab-gen.py12
2 files changed, 7 insertions, 6 deletions
diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh
index e688c9e..7cff479 100755
--- a/lava-slave/scripts/setup.sh
+++ b/lava-slave/scripts/setup.sh
@@ -120,6 +120,7 @@ if [ -e /etc/lava-dispatcher/certificates.d/$(hostname).key ];then
echo "INFO: Enabling encryption"
sed -i 's,.*ENCRYPT=.*,ENCRYPT="--encrypt",' /etc/lava-dispatcher/lava-slave
sed -i "s,.*SLAVE_CERT=.*,SLAVE_CERT=\"--slave-cert /etc/lava-dispatcher/certificates.d/$(hostname).key_secret\"," /etc/lava-dispatcher/lava-slave
+ (cd /etc/lava-dispatcher/certificates.d; if [ -e master.key ]; then cp master.key $LAVA_MASTER.key; fi)
sed -i "s,.*MASTER_CERT=.*,MASTER_CERT=\"--master-cert /etc/lava-dispatcher/certificates.d/$LAVA_MASTER.key\"," /etc/lava-dispatcher/lava-slave
fi
exit 0
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 010839f..634d742 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -156,8 +156,8 @@ def main():
master_use_zmq_auth = worker["zmq_auth"]
if master_use_zmq_auth:
if "zmq_auth_key" in worker:
- shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/" % workerdir)
- shutil.copy(worker["zmq_auth_key_secret"], "%s/zmq_auth/" % workerdir)
+ shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/%s.key" % (workerdir, name))
+ shutil.copy(worker["zmq_auth_key_secret"], "%s/zmq_auth/%s.key_secret" % (workerdir, name))
else:
zmq_auth_genlist.write("%s/%s\n" % (host, name))
need_zmq_auth_gen = True
@@ -294,12 +294,12 @@ def main():
master_use_zmq_auth = fm["zmq_auth"]
if master_use_zmq_auth:
if "zmq_auth_key" in fm:
- shutil.copy(fm["zmq_auth_key"], "%s/zmq_auth/" % workerdir)
+ shutil.copy(fm["zmq_auth_key"], "%s/zmq_auth/%s.key" % (workerdir, remote_address))
if "zmq_auth_key" in worker:
- shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/" % workerdir)
- shutil.copy(worker["zmq_auth_key_secret"], "%s/zmq_auth/" % workerdir)
+ shutil.copy(worker["zmq_auth_key"], "%s/zmq_auth/%s.key" % (workerdir, name))
+ shutil.copy(worker["zmq_auth_key_secret"], "%s/zmq_auth/%s.key_secret" % (workerdir, name))
if "zmq_auth_key" in fm:
- shutil.copy(worker["zmq_auth_key"], "output/%s/%s/zmq_auth/" % (fm["host"], fm["name"]))
+ shutil.copy(worker["zmq_auth_key"], "output/%s/%s/zmq_auth/%s.key" % (fm["host"], fm["name"], name))
else:
zmq_auth_genlist.write("%s/%s %s/%s\n" % (host, name, fm["host"], fm["name"]))
need_zmq_auth_gen = True