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

Modify node daemon to follow API

This commit is contained in:
Joshua Boniface 2019-12-14 14:13:26 -05:00
parent 0727a7f6ed
commit 8c36e7618a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node-daemon/pvcd/Daemon.py
View File

@ -138,7 +138,6 @@ def readConfig(pvcd_config_file, myhostname):
'enable_networking': o_config['pvc']['functions']['enable_networking'], 'enable_networking': o_config['pvc']['functions']['enable_networking'],
'enable_storage': o_config['pvc']['functions']['enable_storage'], 'enable_storage': o_config['pvc']['functions']['enable_storage'],
'enable_api': o_config['pvc']['functions']['enable_api'], 'enable_api': o_config['pvc']['functions']['enable_api'],
'enable_provisioner': o_config['pvc']['functions']['enable_provisioner'],
'dynamic_directory': o_config['pvc']['system']['configuration']['directories']['dynamic_directory'], 'dynamic_directory': o_config['pvc']['system']['configuration']['directories']['dynamic_directory'],
'log_directory': o_config['pvc']['system']['configuration']['directories']['log_directory'], 'log_directory': o_config['pvc']['system']['configuration']['directories']['log_directory'],
'console_log_directory': o_config['pvc']['system']['configuration']['directories']['console_log_directory'], 'console_log_directory': o_config['pvc']['system']['configuration']['directories']['console_log_directory'],

7
node-daemon/pvcd/NodeInstance.py
View File

@ -266,9 +266,6 @@ class NodeInstance(object):
if self.config['enable_api']: if self.config['enable_api']:
self.logger.out('Stopping PVC API client service', state='i') self.logger.out('Stopping PVC API client service', state='i')
common.run_os_command("systemctl stop pvc-api.service") common.run_os_command("systemctl stop pvc-api.service")
if self.config['enable_provisioner']:
self.logger.out('Stopping PVC Provisioner service', state='i')
common.run_os_command("systemctl stop pvc-provisioner.service")
for network in self.d_network: for network in self.d_network:
self.d_network[network].stopDHCPServer() self.d_network[network].stopDHCPServer()
self.d_network[network].removeGateways() self.d_network[network].removeGateways()
@ -326,10 +323,8 @@ class NodeInstance(object):
if self.config['enable_api']: if self.config['enable_api']:
self.logger.out('Starting PVC API client service', state='i') self.logger.out('Starting PVC API client service', state='i')
common.run_os_command("systemctl start pvc-api.service") common.run_os_command("systemctl start pvc-api.service")
if self.config['enable_provisioner']: self.logger.out('Starting PVC Provisioner Worker service', state='i')
self.logger.out('Starting PVC Provisioner service', state='i')
common.run_os_command("systemctl start pvc-provisioner-worker.service") common.run_os_command("systemctl start pvc-provisioner-worker.service")
common.run_os_command("systemctl start pvc-provisioner.service")
def createFloatingAddresses(self): def createFloatingAddresses(self):
# VNI floating IP # VNI floating IP