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

Fixed up get_dns for normal isolated vrs

Browse Source
This commit is contained in:
Ian Southam 2015-01-28 16:41:12 +01:00 committed by wilderrodrigues
parent bf6e3fa8b2
commit 2b0c4c85a9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,14 @@ class CsConfig(object):
return self.cl.get_domain() return self.cl.get_domain()
def get_dns(self): def get_dns(self):
return self.cmdline().get_dns() dns = []
# Check what happens with use_ext_dns
dns.append(self.address().get_guest_ip())
names = ["dns1", "dns2"]
for name in names:
if name in self.cmdline().idata():
dns.append(self.cmdline().idata()[name])
return dns
def get_format(self): def get_format(self):
return self.__LOG_FORMAT return self.__LOG_FORMAT

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

@ -93,14 +93,6 @@ class CsCmdLine(CsDataBag):
else: else:
return "unloved-router" return "unloved-router"
def get_dns(self):
dns = []
names = "dns1 dns2"
for name in names:
if name in self.idata():
dns.append(self.idata()[name])
return dns
def get_type(self): def get_type(self):
if "type" in self.idata(): if "type" in self.idata():
return self.idata()['type'] return self.idata()['type']