summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-24 09:16:28 +0100
committerLinus Nordberg <linus@nordu.net>2017-01-24 09:16:28 +0100
commitd08eabfdd47ccb06901335224f7bab01ced44ea2 (patch)
treef3f2ef091d42343f7848b33a77344d45e71356dc /tools
parenta4709803d2e824cd447e3906cfb5ee89068802fc (diff)
Rename a variable for consistency.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/compileconfig.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index 3961db3..23f0cf1 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -302,7 +302,7 @@ def gen_config(nodename, config, localconfig):
signingnodes = config["signingnodes"]
signingnodeaddresses = ["https://%s/plop/v1/signing/" % node["address"] for node in config["signingnodes"]]
mergenodenames = [node["name"] for node in config["mergenodes"]]
- primarymergenode = config["primarymergenode"]
+ primarymergenodename = config["primarymergenode"]
storagenodeaddresses = ["https://%s/plop/v1/storage/" % node["address"] for node in config["storagenodes"]]
frontendnodenames = [node["name"] for node in config["frontendnodes"]]
@@ -315,20 +315,20 @@ def gen_config(nodename, config, localconfig):
plopconfig.append((Symbol("storage_nodes"), storagenodeaddresses))
plopconfig.append((Symbol("storage_nodes_quorum"), config["storage-quorum-size"]))
services.add(Symbol("ht"))
- allowed_clients += allowed_clients_frontend(mergenodenames, primarymergenode)
+ allowed_clients += allowed_clients_frontend(mergenodenames, primarymergenodename)
allowed_clients += allowed_clients_public()
allowed_servers += allowed_servers_frontend([node["name"] for node in signingnodes], storagenodenames)
if "storagenodes" in nodetype:
allowed_clients += allowed_clients_storage(frontendnodenames, mergenodenames)
if "signingnodes" in nodetype:
- allowed_clients += allowed_clients_signing(frontendnodenames, primarymergenode)
+ allowed_clients += allowed_clients_signing(frontendnodenames, primarymergenodename)
services = [Symbol("sign")]
if "mergenodes" in nodetype:
storagenodenames = [node["name"] for node in config["storagenodes"]]
plopconfig.append((Symbol("storage_nodes"), storagenodeaddresses))
plopconfig.append((Symbol("storage_nodes_quorum"), config["storage-quorum-size"]))
services.add(Symbol("ht"))
- allowed_clients += allowed_clients_mergesecondary(primarymergenode)
+ allowed_clients += allowed_clients_mergesecondary(primarymergenodename)
plopconfig += [
(Symbol("publickey_path"), paths["publickeys"]),