diff options
Diffstat (limited to 'tools/compileconfig.py')
| -rwxr-xr-x | tools/compileconfig.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/compileconfig.py b/tools/compileconfig.py index 264cb42..199e446 100755 --- a/tools/compileconfig.py +++ b/tools/compileconfig.py @@ -248,7 +248,6 @@ def gen_config(nodename, config, localconfig): } bind_publicaddress = localconfig.get("ctapiaddress") bind_publichttpaddress = localconfig.get("publichttpaddress") - options = localconfig.get("options", []) configfile = open(paths["configdir"] + "/" + nodename + ".config", "w") print >>configfile, "%% catlfish configuration file (-*- erlang -*-)" @@ -373,7 +372,7 @@ def gen_config(nodename, config, localconfig): allowed_servers = [] storagenodenames = [node["name"] for node in config["storagenodes"]] services = set() - storage_sign_quorum = config.get("storage-sign-quorum-size", 0) + storage_sign_quorum = config["storage-sign-quorum-size"] allnodenames = set(signingnodenames + mergenodenames + frontendnodenames + statusservernames + storagenodenames) @@ -526,7 +525,7 @@ def gen_testmakefile(config, testmakefile, shellvars=False): signingnodenames = set([node["name"] for node in config["signingnodes"]]) mergenodenames = set([node["name"] for node in config["mergenodes"]]) mergesecondarynodenames = set([node["name"] for node in config["mergenodes"] if node["name"] != config["primarymergenode"]]) - statusservernodenames = set([node["name"] for node in config.get("statusservers")]) + statusservernodenames = set([node["name"] for node in config["statusservers"]]) frontendnodenames_except_last = sorted(frontendnodenames)[:-1] frontendnodenames_except_first = sorted(frontendnodenames)[1:] @@ -558,7 +557,7 @@ def printnodenames(config): storagenodenames = set([node["name"] for node in config["storagenodes"]]) signingnodenames = set([node["name"] for node in config["signingnodes"]]) mergenodenames = set([node["name"] for node in config["mergenodes"]]) - statusservernodenames = set([node["name"] for node in config.get("statusservers")]) + statusservernodenames = set([node["name"] for node in config["statusservers"]]) print " ".join(frontendnodenames|storagenodenames|signingnodenames|mergenodenames|statusservernodenames) |