From 2e2459c63c9c45d7c51e0e8930cf94de8c961955 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sun, 14 Oct 2018 18:35:32 -0400 Subject: [PATCH] Some cleanups and fix bridge interface bug --- node-daemon/pvcd/VXNetworkInstance.py | 13 +++---------- node-daemon/pvcd/common.py | 1 - node-daemon/pvcd/dnsmasq-zookeeper-leases.py | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/node-daemon/pvcd/VXNetworkInstance.py b/node-daemon/pvcd/VXNetworkInstance.py index 0b4cd4a4..f6ce9d17 100644 --- a/node-daemon/pvcd/VXNetworkInstance.py +++ b/node-daemon/pvcd/VXNetworkInstance.py @@ -269,7 +269,6 @@ add rule inet filter input meta iifname {bridgenic} counter drop vxlannic=self.vxlan_nic, bridgenic=self.bridge_nic ) - print(nftables_network_rules) with open(self.nftables_netconf_filename, 'w') as nfbasefile: nfbasefile.write(dedent(nftables_network_rules)) open(self.nftables_update_filename, 'a').close() @@ -285,12 +284,6 @@ add rule inet filter input meta iifname {bridgenic} counter drop prefix='VNI {}'.format(self.vni), state='o' ) - print('ip address add {}/{} dev {}'.format( - self.ip_gateway, - self.ip_cidrnetmask, - self.bridge_nic - )) - common.run_os_command( 'ip address add {}/{} dev {}'.format( self.ip_gateway, @@ -324,7 +317,7 @@ add rule inet filter input meta iifname {bridgenic} counter drop # Recreate the environment we need for dnsmasq pvcd_config_file = os.environ['PVCD_CONFIG_FILE'] dhcp_environment = { - 'DNSMASQ_INTERFACE': self.bridge_nic, + 'DNSMASQ_BRIDGE_INTERFACE': self.bridge_nic, 'PVCD_CONFIG_FILE': pvcd_config_file } # Define the dnsmasq config @@ -337,7 +330,7 @@ add rule inet filter input meta iifname {bridgenic} counter drop '--domain={}'.format(self.domain), '--local=/{}/'.format(self.domain), '--auth-zone={}'.format(self.domain), -# '--auth-peer=127.0.0.1,{}'.format(self.ip_gateway), + '--auth-peer=127.0.0.1,{}'.format(self.ip_gateway), '--auth-sec-servers=127.0.0.1,[::1],{}'.format(self.ip_gateway), '--listen-address={}'.format(self.ip_gateway), '--bind-interfaces', @@ -347,7 +340,7 @@ add rule inet filter input meta iifname {bridgenic} counter drop '--dhcp-lease-max=99', '--dhcp-hostsdir={}'.format(self.dnsmasq_hostsdir), '--log-queries=extra', - '--log-facility=DAEMON', + '--log-facility={}/dnsmasq.log'.format(self.config['dnsmasq_log_directory']), '--keep-in-foreground' ] # Start the dnsmasq process in a thread diff --git a/node-daemon/pvcd/common.py b/node-daemon/pvcd/common.py index 397b4793..c12cf73e 100644 --- a/node-daemon/pvcd/common.py +++ b/node-daemon/pvcd/common.py @@ -47,7 +47,6 @@ class OSDaemon(object): def run_os_daemon(command_string, environment=None): command = command_string.split() - print(' '.join(command)) daemon = OSDaemon(command, environment) return daemon diff --git a/node-daemon/pvcd/dnsmasq-zookeeper-leases.py b/node-daemon/pvcd/dnsmasq-zookeeper-leases.py index 123e4a3e..98757b60 100755 --- a/node-daemon/pvcd/dnsmasq-zookeeper-leases.py +++ b/node-daemon/pvcd/dnsmasq-zookeeper-leases.py @@ -15,7 +15,7 @@ import re def get_zookeeper_key(): # Get the interface from environment (passed by dnsmasq) try: - interface = os.environ['DNSMASQ_INTERFACE'] + interface = os.environ['DNSMASQ_BRIDGE_INTERFACE'] except: exit(1) # Get the ID of the interface (the digits)