aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-12-13 10:53:42 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-12-13 10:56:26 +0100
commit9719f4b294b4d295ed62848c3a82a5271eb86139 (patch)
treebce39c6ef28735827150dd366d323dfb0c3586d7
parent1607ceaf5c6d2e5f9b8656dedd53049c66eaa079 (diff)
downloadmknet-9719f4b294b4d295ed62848c3a82a5271eb86139.tar.gz
mknet-9719f4b294b4d295ed62848c3a82a5271eb86139.zip
Change env name + fix python casting
-rwxr-xr-xexample/deploy_minio.py4
-rwxr-xr-xmknet4
2 files changed, 4 insertions, 4 deletions
diff --git a/example/deploy_minio.py b/example/deploy_minio.py
index 4488974..431b983 100755
--- a/example/deploy_minio.py
+++ b/example/deploy_minio.py
@@ -19,7 +19,7 @@ def leader():
sock.bind(UNIX_SOCK)
sock.listen()
- n_serv = os.environ['SIZE']
+ n_serv = int(os.environ['SERVER_COUNT'])
fl = [ co for co, addr in [ sock.accept() for i in range(n_serv - 1) ]]
identities = [ json.loads(co.makefile().readline()) for co in fl ] + [ { "ip": os.environ['IP'], "path": make_data() } ]
@@ -52,7 +52,7 @@ def make_data():
return data_path
def run_minio(identities):
- cmd = f"minio server --console-address ':9001' --address [{os.environ['IP']}]:9000"
+ cmd = f"minio server --console-address ':9001' --address ':9000'"
for ident in identities:
cmd += f" http://[{ident['ip']}]:9000{ident['path']}"
cmd += f" > {os.path.join(STORAGE_PATH, 'minio'+os.environ['ID']+'.log')} 2>&1"
diff --git a/mknet b/mknet
index 8eb276a..9081aeb 100755
--- a/mknet
+++ b/mknet
@@ -321,7 +321,7 @@ def runall(cmd):
env["HOST"] = server.name
env["IP"] = str(server.ip)
env["ID"] = str(number)
- env["SIZE"] = str(len(config['servers']))
+ env["SERVER_COUNT"] = str(len(config['servers']))
name = f'testnet-{zone.name}-{server.name}'
net.ns.run(name, cmd, env)
number +=1
@@ -331,7 +331,7 @@ def runall(cmd):
env["HOST"] = zone.name
env["IP"] = str(zone.ip)
env["ID"] = str(number)
- env["SIZE"] = str(len(config['servers']))
+ env["SERVER_COUNT"] = str(len(config['servers']))
name = f'testnet-{zone.name}-{zone.name}'
net.ns.run(name, cmd, env)
first = False