diff --git a/api-daemon/pvcapid/Daemon.py b/api-daemon/pvcapid/Daemon.py index f235c752..e52681f0 100755 --- a/api-daemon/pvcapid/Daemon.py +++ b/api-daemon/pvcapid/Daemon.py @@ -81,6 +81,7 @@ 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( diff --git a/daemon-common/cluster.py b/daemon-common/cluster.py index b85f1dcb..b30b0218 100644 --- a/daemon-common/cluster.py +++ b/daemon-common/cluster.py @@ -496,6 +496,7 @@ 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, diff --git a/health-daemon/pvchealthd/Daemon.py b/health-daemon/pvchealthd/Daemon.py index a7315f9d..7895a785 100644 --- a/health-daemon/pvchealthd/Daemon.py +++ b/health-daemon/pvchealthd/Daemon.py @@ -64,6 +64,7 @@ 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"])) diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py index 64db8ffd..9ecff8ad 100644 --- a/node-daemon/pvcnoded/Daemon.py +++ b/node-daemon/pvcnoded/Daemon.py @@ -83,6 +83,7 @@ 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"])) @@ -301,6 +302,9 @@ 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")