cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [10/15] git commit: updated refs/heads/master to e4ba640
Date Tue, 28 Jun 2016 15:28:44 GMT
VR CsConfig: reintroduce old get_dns() behaviour for redundant non-VPC's


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

Branch: refs/heads/master
Commit: f379df4bc27eda991079f3e462bfd27a11bfea12
Parents: d14a484
Author: Ronald van Zantvoort <ronald@pcextreme.nl>
Authored: Wed May 18 14:09:39 2016 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue Jun 7 13:03:10 2016 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f379df4b/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 f3de977..e3b9009 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
@@ -82,7 +82,10 @@ class CsConfig(object):
         conf = self.cmdline().idata()
         dns = []
         if not self.use_extdns():
-            dns.append(self.address().get_guest_ip())
+            if not self.is_vpc() and self.cl.is_redundant() and self.cl.get_guest_gw():
+                dns.append(self.cl.get_guest_gw())
+            else:
+                dns.append(self.address().get_guest_ip())
 
         for name in ('dns1', 'dns2'):
             if name in conf:


Mime
View raw message