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

Merge node common with daemon common

Browse Source
This commit is contained in:
Joshua Boniface
2021-06-01 12:17:25 -04:00
parent f73c433fc7
commit 9764090d6d
9 changed files with 146 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node-daemon/pvcnoded/Daemon.py
View File

@ -44,7 +44,7 @@ from daemon_lib.zkhandler import ZKHandler
import pvcnoded.log as log
import pvcnoded.fencing as fencing
import pvcnoded.common as common
import daemon_lib.common as common
import pvcnoded.VMInstance as VMInstance
import pvcnoded.NodeInstance as NodeInstance
@ -782,7 +782,7 @@ if enable_networking:
nftables_base_filename = '{}/base.nft'.format(config['nft_dynamic_directory'])
with open(nftables_base_filename, 'w') as nfbasefile:
nfbasefile.write(nftables_base_rules)
common.reload_firewall_rules(logger, nftables_base_filename)
common.reload_firewall_rules(nftables_base_filename, logger=logger)
###############################################################################
# PHASE 7d - Ensure DNSMASQ is not running