Merge release branch 4.8 to master

* 4.8:
  This patch addresses two issues:

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

@@ -68,8 +68,11 @@ def get_domain(self):
 
  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():

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

@@ -148,3 +148,9 @@ def get_gateway(self):
  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
+