api-daemon/pvcapid/Daemon.py

@@ -81,7 +81,6 @@ def create_app():
     print("|--------------------------------------------------------------|")
     print("| Parallel Virtual Cluster API daemon v{0: <23} |".format(version))
     print("| Debug: {0: <53} |".format(str(config["debug"])))
-    print("| Cluster: {0: <51} |".format(config["cluster_name"]))
     print("| API version: v{0: <46} |".format(API_VERSION))
     print(
         "| Listen: {0: <52} |".format(

daemon-common/cluster.py

@@ -496,7 +496,6 @@ def getClusterInformation(zkhandler):
 
     # Format the status data
     cluster_information = {
-        "cluster_name": zkhandler.read("base.config"),
         "cluster_health": getClusterHealthFromFaults(zkhandler, faults_data),
         "node_health": getNodeHealth(zkhandler, node_list),
         "maintenance": maintenance_state,

daemon-common/common.py

@@ -1212,7 +1212,3 @@ def get_detect_device(detect_string):
         return device
     else:
         return None
-
-
-def translate_domains_to_names(zkhandler, domain_list):
-    return list(zkhandler.read_many([("domain.name", d) for d in domain_list]))

daemon-common/node.py

@@ -142,9 +142,7 @@ def getNodeInformation(zkhandler, node_name):
     node_mem_free = int(_node_mem_free)
     node_load = float(_node_load)
     node_domains_count = int(_node_domains_count)
-    node_running_domains = common.translate_domains_to_names(
-        zkhandler, _node_running_domains.split()
-    )
+    node_running_domains = _node_running_domains.split()
 
     try:
         node_health = int(_node_health)

health-daemon/pvchealthd/Daemon.py

@@ -64,7 +64,6 @@ def entrypoint():
     logger.out("|--------------------------------------------------------------|")
     logger.out("| Parallel Virtual Cluster health daemon v{0: <20} |".format(version))
     logger.out("| Debug: {0: <53} |".format(str(config["debug"])))
-    logger.out("| Cluster: {0: <51} |".format(config["cluster_name"]))
     logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"]))
     logger.out("| Host: {0: <54} |".format(config["node_hostname"]))
     logger.out("| ID: {0: <56} |".format(config["node_id"]))

node-daemon/pvcnoded/Daemon.py

@@ -83,7 +83,6 @@ def entrypoint():
     logger.out("|--------------------------------------------------------------|")
     logger.out("| Parallel Virtual Cluster node daemon v{0: <22} |".format(version))
     logger.out("| Debug: {0: <53} |".format(str(config["debug"])))
-    logger.out("| Cluster: {0: <51} |".format(config["cluster_name"]))
     logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"]))
     logger.out("| Host: {0: <54} |".format(config["node_hostname"]))
     logger.out("| ID: {0: <56} |".format(config["node_id"]))
@@ -302,9 +301,6 @@ def entrypoint():
     # Set up this node in Zookeeper
     pvcnoded.util.zookeeper.setup_node(logger, config, zkhandler)
 
-    # Set the cluster name in Zookeeper
-    zkhandler.write([("base.config", config["cluster_name"])])
-
     # Check that the primary node key exists and create it with us as primary if not
     try:
         current_primary = zkhandler.read("base.config.primary_node")