parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Tweak some more things in the Daemon to reflect split

This commit is contained in:
Joshua Boniface 2018-09-12 12:27:55 -04:00
parent 2b935bd923
commit 8791224e64
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtualization-daemon/pvcvd.service
View File

@ -7,7 +7,7 @@ After = network-online.target libvirtd.service zookeeper.service
Type = simple Type = simple
WorkingDirectory = /usr/share/pvc WorkingDirectory = /usr/share/pvc
Environment = PYTHONUNBUFFERED=true Environment = PYTHONUNBUFFERED=true
Environment = PVCD_CONFIG_FILE=/etc/pvc/pvcvd.conf Environment = PVCVD_CONFIG_FILE=/etc/pvc/pvcvd.conf
ExecStart = /usr/share/pvc/pvcvd.py ExecStart = /usr/share/pvc/pvcvd.py
Restart = on-failure Restart = on-failure

10
virtualization-daemon/pvcvd/Daemon.py
View File

@ -39,13 +39,13 @@ import lib.zkhandler as zkhandler
import pvcvd.VMInstance as VMInstance import pvcvd.VMInstance as VMInstance
import pvcvd.NodeInstance as NodeInstance import pvcvd.NodeInstance as NodeInstance
print(ansiiprint.bold() + "pvcvd - Parallel Virtual Cluster management daemon" + ansiiprint.end()) print(ansiiprint.bold() + "pvcvd - Parallel Virtual Cluster virtualization daemon" + ansiiprint.end())
# Get the config file variable from the environment # Get the config file variable from the environment
try: try:
pvcvd_config_file = os.environ['PVCD_CONFIG_FILE'] pvcvd_config_file = os.environ['PVCVD_CONFIG_FILE']
except: except:
print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcvd.') print('ERROR: The "PVCVD_CONFIG_FILE" environment variable must be set before starting pvcvd.')
exit(1) exit(1)
myhostname = socket.gethostname() myhostname = socket.gethostname()
@ -182,9 +182,9 @@ print('{0}Node hostname:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), myh
print('{0}IPMI hostname:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), config['ipmi_hostname'])) print('{0}IPMI hostname:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), config['ipmi_hostname']))
print('{0}Machine details:{1}'.format(ansiiprint.bold(), ansiiprint.end())) print('{0}Machine details:{1}'.format(ansiiprint.bold(), ansiiprint.end()))
print(' {0}CPUs:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[0])) print(' {0}CPUs:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[0]))
print(' {0}Arch:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[1])) print(' {0}Arch:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[3]))
print(' {0}OS:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[2])) print(' {0}OS:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[2]))
print(' {0}Kernel:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[3])) print(' {0}Kernel:{1} {2}'.format(ansiiprint.bold(), ansiiprint.end(), staticdata[1]))
# Check if our node exists in Zookeeper, and create it if not # Check if our node exists in Zookeeper, and create it if not
if zk_conn.exists('/nodes/{}'.format(myhostname)): if zk_conn.exists('/nodes/{}'.format(myhostname)):