From 3df83658510ca6241ee678ac34204888d9ed7f21 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sun, 17 Mar 2019 12:35:25 -0400 Subject: [PATCH] Only manage DHCP on managed networks --- node-daemon/pvcd/VXNetworkInstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node-daemon/pvcd/VXNetworkInstance.py b/node-daemon/pvcd/VXNetworkInstance.py index adf78160..e495522b 100644 --- a/node-daemon/pvcd/VXNetworkInstance.py +++ b/node-daemon/pvcd/VXNetworkInstance.py @@ -537,7 +537,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out common.createIPAddress(self.ip4_gateway, self.ip4_cidrnetmask, self.bridge_nic) def startDHCPServer(self): - if self.this_node.router_state == 'primary': + if self.this_node.router_state == 'primary' and self.nettype == 'managed': self.logger.out( 'Starting dnsmasq DHCP server on interface {}'.format( self.bridge_nic @@ -746,7 +746,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out common.removeIPAddress(self.ip4_gateway, self.ip4_cidrnetmask, self.bridge_nic) def stopDHCPServer(self): - if self.dhcp_server_daemon: + if self.nettype == 'managed' and self.dhcp_server_daemon: self.logger.out( 'Stopping dnsmasq DHCP server on interface {}'.format( self.bridge_nic