cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.3 to 8cb51dc
Date Wed, 18 Dec 2013 00:06:40 GMT
Updated Branches:
  refs/heads/4.3 a930b7576 -> 8cb51dcc8


CLOUDSTACK-5533: Disable VR's DNS functionality if user choose to use external dns

Also fix the regression that external dns won't be used if "dns" service in the
network offering is unset.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8cb51dcc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8cb51dcc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8cb51dcc

Branch: refs/heads/4.3
Commit: 8cb51dcc88dde69b8ed657363fd807d384f6387a
Parents: a930b75
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Tue Dec 17 16:04:21 2013 -0800
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Dec 17 16:06:31 2013 -0800

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java     | 2 +-
 systemvm/patches/debian/config/etc/init.d/cloud-early-config   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cb51dcc/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index a3cafa5..ca01831 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2030,7 +2030,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
 
             boolean useExtDns = !dnsProvided;
             /* For backward compatibility */
-            useExtDns = UseExternalDnsServers.valueIn(dc.getId());
+            useExtDns = useExtDns || UseExternalDnsServers.valueIn(dc.getId());
 
             if (useExtDns) {
                 buf.append(" useextdns=true");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cb51dcc/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index d4bf0eb..05661fc 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -715,6 +715,12 @@ setup_dnsmasq() {
   then
     [ $ETH0_IP ] && NS="$INTERNAL_DNS,$NS"
     [ $ETH0_IP6 ] && NS6="[::],$NS6"
+    # enable dns
+    sed -i -e "/^[#]*port=.*$/d" /etc/dnsmasq.conf
+  else
+    # disable dns
+    sed -i -e "/^[#]*port=.*$/d" /etc/dnsmasq.conf
+    echo "port=0" >> /etc/dnsmasq.conf
   fi
   NS=${NS%?}
   NS6=${NS6%?}


Mime
View raw message