You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:11 UTC
[09/50] git commit: updated refs/heads/master to 3c429ee
Fixed up get_dns for normal isolated vrs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b0c4c85
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b0c4c85
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b0c4c85
Branch: refs/heads/master
Commit: 2b0c4c85a90e3ae929e0d2c47ca95331c99172a6
Parents: bf6e3fa
Author: Ian Southam <is...@schubergphilis.com>
Authored: Wed Jan 28 16:41:12 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:39:53 2015 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py | 9 ++++++++-
.../patches/debian/config/opt/cloud/bin/cs/CsDatabag.py | 8 --------
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b0c4c85/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 2e8db01..a08f1cc 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py
@@ -67,7 +67,14 @@ class CsConfig(object):
return self.cl.get_domain()
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):
return self.__LOG_FORMAT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b0c4c85/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 936f993..e6ad6e5 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py
@@ -93,14 +93,6 @@ class CsCmdLine(CsDataBag):
else:
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):
if "type" in self.idata():
return self.idata()['type']