From 40d93af16cef2fce9aa31d850e3b6471f2aaa49a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 24 Mar 2021 07:42:33 +0100 Subject: [PATCH] vpc: dnsmasq is not started if use.external.dns is true (#4806) * vpc: dnsmasq is not started if use.external.dns is true * Revert "vpc: dnsmasq is not started if use.external.dns is true" This reverts commit ee58fe0787dfd2353a0c95717c20fc2465946257. * #4806 vpc: fix zone dns1/dns2 are missing in vpc VR when restart vpc or vpc VR --- .../cloud/network/router/CommandSetupHelper.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java index 262fa4b4ff1..e344b462b50 100644 --- a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java +++ b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java @@ -1008,8 +1008,17 @@ public class CommandSetupHelper { final boolean setupDns = dnsProvided || dhcpProvided; if (setupDns) { - defaultDns1 = guestNic.getIPv4Dns1(); - defaultDns2 = guestNic.getIPv4Dns2(); + final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); + if (guestNic.getIPv4Dns1() != null) { + defaultDns1 = guestNic.getIPv4Dns1(); + } else { + defaultDns1 = dcVo.getDns1(); + } + if (guestNic.getIPv4Dns2() != null) { + defaultDns2 = guestNic.getIPv4Dns2(); + } else { + defaultDns2 = dcVo.getDns2(); + } } final Nic nic = _nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId());