apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1536 from ntavares/useextdns_rvmvip47

Browse Source 
Honour GS use_ext_dns and redundant VR VIPThis 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.

* pr/1536:
  This patch addresses two issues:

Signed-off-by: Will Stevens <williamstevens@gmail.com>
This commit is contained in:
Will Stevens 2016-05-12 18:23:00 -04:00
commit bbb2dd034e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
View File

@ -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():

6
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
View File

@ -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