From 8c36e7618a701e3c094961ffcd4fd026a520b231 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 14 Dec 2019 14:13:26 -0500 Subject: [PATCH] Modify node daemon to follow API --- node-daemon/pvcd/Daemon.py | 1 - node-daemon/pvcd/NodeInstance.py | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index 8233ee68..f4e6397d 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -138,7 +138,6 @@ def readConfig(pvcd_config_file, myhostname): 'enable_networking': o_config['pvc']['functions']['enable_networking'], 'enable_storage': o_config['pvc']['functions']['enable_storage'], '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'], 'log_directory': o_config['pvc']['system']['configuration']['directories']['log_directory'], 'console_log_directory': o_config['pvc']['system']['configuration']['directories']['console_log_directory'], diff --git a/node-daemon/pvcd/NodeInstance.py b/node-daemon/pvcd/NodeInstance.py index 398118ef..95eebee6 100644 --- a/node-daemon/pvcd/NodeInstance.py +++ b/node-daemon/pvcd/NodeInstance.py @@ -266,9 +266,6 @@ class NodeInstance(object): if self.config['enable_api']: self.logger.out('Stopping PVC API client service', state='i') 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: self.d_network[network].stopDHCPServer() self.d_network[network].removeGateways() @@ -326,10 +323,8 @@ class NodeInstance(object): if self.config['enable_api']: self.logger.out('Starting PVC API client service', state='i') common.run_os_command("systemctl start pvc-api.service") - if self.config['enable_provisioner']: - self.logger.out('Starting PVC Provisioner service', state='i') + self.logger.out('Starting PVC Provisioner Worker service', state='i') common.run_os_command("systemctl start pvc-provisioner-worker.service") - common.run_os_command("systemctl start pvc-provisioner.service") def createFloatingAddresses(self): # VNI floating IP