From 3b1a83a3615aaadcecef0e802c6ee9ac006c415a Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 14 Jan 2025 11:05:39 +0100 Subject: [PATCH 1/5] add workaround from issue reporter --- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py index 8f1562b0b82d..6861ed11004d 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py @@ -139,6 +139,7 @@ def configure_server(self): # Listen Address if self.cl.is_redundant(): listen_address.append(gateway) + listen_address.append(ip) else: listen_address.append(ip) # Add localized "data-server" records in /etc/hosts for VPC routers From ecb725fb1d256cb0dc89223291329e9d8f03b92c Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 14 Jan 2025 13:48:10 +0100 Subject: [PATCH 2/5] Update systemvm/debian/opt/cloud/bin/cs/CsDhcp.py --- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py index 6861ed11004d..385cc49a90f8 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py @@ -139,9 +139,7 @@ def configure_server(self): # Listen Address if self.cl.is_redundant(): listen_address.append(gateway) - listen_address.append(ip) - else: - listen_address.append(ip) + listen_address.append(ip) # Add localized "data-server" records in /etc/hosts for VPC routers if self.config.is_vpc() or self.config.is_router(): self.add_host(gateway, "%s data-server" % CsHelper.get_hostname()) From f4af74be171baeff4d24f8c100ed65f95033ae9f Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 31 Jan 2025 13:16:44 -0500 Subject: [PATCH 3/5] uncomment dnsmasq leases file in conf --- systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh index bc08dccc5774..bdc3301f9f2d 100755 --- a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh +++ b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh @@ -115,6 +115,8 @@ setup_vpcrouter() { sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer + sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf + # reload daemon /usr/bin/systemctl daemon-reload From c8a023bd738ee9325a221e3cc839e51afe155eb6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 3 Feb 2025 15:04:50 +0100 Subject: [PATCH 4/5] uncomment dnsmasq leases file in conf for isolated router --- systemvm/debian/opt/cloud/bin/setup/router.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemvm/debian/opt/cloud/bin/setup/router.sh b/systemvm/debian/opt/cloud/bin/setup/router.sh index 190ad60d9159..bdc58937df14 100755 --- a/systemvm/debian/opt/cloud/bin/setup/router.sh +++ b/systemvm/debian/opt/cloud/bin/setup/router.sh @@ -87,6 +87,8 @@ setup_router() { sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer + sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf + # reload daemon /usr/bin/systemctl daemon-reload From 72a370e2ebef410ecf91ad1092fd31c6bc73d94e Mon Sep 17 00:00:00 2001 From: dahn Date: Thu, 6 Feb 2025 16:14:04 +0100 Subject: [PATCH 5/5] Apply suggestions from code review --- systemvm/debian/opt/cloud/bin/setup/router.sh | 2 -- systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/setup/router.sh b/systemvm/debian/opt/cloud/bin/setup/router.sh index bdc58937df14..190ad60d9159 100755 --- a/systemvm/debian/opt/cloud/bin/setup/router.sh +++ b/systemvm/debian/opt/cloud/bin/setup/router.sh @@ -87,8 +87,6 @@ setup_router() { sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer - sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf - # reload daemon /usr/bin/systemctl daemon-reload diff --git a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh index bdc3301f9f2d..bc08dccc5774 100755 --- a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh +++ b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh @@ -115,8 +115,6 @@ setup_vpcrouter() { sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer - sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf - # reload daemon /usr/bin/systemctl daemon-reload