cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 2b4b8aa
Date Thu, 12 May 2016 22:25:25 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 9320f858f -> 2b4b8aa40


This patch addresses two issues:

On redundant VR setups, the primary resolver being handed out to instances is the guest_ip
(primary IP for the VR). This might lead to problems upon failover, at least while the DHCP
lease doesn't update (because the primary resolver will be checked first until times out,
however it'll be gone upon failover).

If Global Setting use_ext_dns is true, we don't want the VR to be the primary resolver at
all.


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

Branch: refs/heads/master
Commit: c269097a278b9bdf5b9ded457172ce3bf7b707ad
Parents: a243339
Author: Nuno Tavares <n.tavares@tech.leaseweb.com>
Authored: Sat May 7 17:56:47 2016 +0200
Committer: Nuno Tavares <n.tavares@tech.leaseweb.com>
Committed: Sun May 8 22:47:55 2016 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py  | 7 +++++--
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c269097a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
index a08f1cc..a35a545 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
@@ -68,8 +68,11 @@ class CsConfig(object):
 
     def get_dns(self):
         dns = []
-        # Check what happens with use_ext_dns
-        dns.append(self.address().get_guest_ip())
+        if not self.cl.get_use_ext_dns():
+            if not self.is_vpc() and self.cl.is_redundant():
+                dns.append(self.cl.get_guest_gw())
+            else:
+                dns.append(self.address().get_guest_ip())
         names = ["dns1", "dns2"]
         for name in names:
             if name in self.cmdline().idata():

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c269097a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
index e29aa36..ce490aa 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
@@ -148,3 +148,9 @@ class CsCmdLine(CsDataBag):
         if "gateway" in self.idata():
             return self.idata()['gateway']
         return False
+
+    def get_use_ext_dns(self):
+        if "useextdns" in self.idata():
+            return self.idata()['useextdns']
+        return False
+


Mime
View raw message