From 181bd1f2b8f51e8dac24ed4bdad1faf642645155 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 11 Jun 2018 01:55:36 -0400 Subject: [PATCH] Remove IPMI stuff from keepalive message and add to startup; convert memory into MB --- NodeInstance.py | 6 +++--- pvcd.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NodeInstance.py b/NodeInstance.py index 4c734086..bd9bc625 100644 --- a/NodeInstance.py +++ b/NodeInstance.py @@ -185,8 +185,8 @@ class NodeInstance(): # Set our information in zookeeper self.name = conn.getHostname() self.cpucount = conn.getCPUMap()[0] - self.memused = psutil.virtual_memory().used / 1024 / 1024 - self.memfree = psutil.virtual_memory().free / 1024 / 1024 + self.memused = int(psutil.virtual_memory().used / 1024 / 1024) + self.memfree = int(psutil.virtual_memory().free / 1024 / 1024) self.cpuload = os.getloadavg()[0] self.domains_count = len(conn.listDomainsID()) keepalive_time = int(time.time()) @@ -206,7 +206,7 @@ class NodeInstance(): # Display node information to the terminal ansiiprint.echo('{}{} keepalive{}'.format(ansiiprint.purple(), self.name, ansiiprint.end()), '', 't') - ansiiprint.echo('{0}CPUs:{1} {2} {0}Free memory [MiB]:{1} {3} {0}Used memory [MiB]:{4} {0}Load:{1} {5} {0}IPMI Address:{1} {6}'.format(ansiiprint.bold(), ansiiprint.end(), self.cpucount, self.memfree, self.memused, self.cpuload, self.ipmi_hostname), '', 'c') + ansiiprint.echo('{0}CPUs:{1} {2} {0}Free memory [MiB]:{1} {3} {0}Used memory [MiB]:{1} {4} {0}Load:{1} {5}'.format(ansiiprint.bold(), ansiiprint.end(), self.cpucount, self.memfree, self.memused, self.cpuload), '', 'c') ansiiprint.echo('{}Active domains:{} {} [{}]'.format(ansiiprint.bold(), ansiiprint.end(), self.domains_count, ','.join(self.domain_list)), '', 'c') # Update our local node lists diff --git a/pvcd.py b/pvcd.py index e616ce4e..74d0914f 100755 --- a/pvcd.py +++ b/pvcd.py @@ -144,6 +144,8 @@ else: zk.create('/nodes/{}/ipmiusername'.format(myhostname), config['ipmi_username'].encode('ascii')) zk.create('/nodes/{}/ipmipassword'.format(myhostname), config['ipmi_password'].encode('ascii')) +print('IPMI hostname: {}'.format(config['ipmi_hostname'])) + t_node = dict() s_domain = dict() node_list = []