You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/24 09:16:23 UTC
[5/6] git commit: updated refs/heads/master to b1c7d4b
CLOUDSTACK-8935 - Filter the DNS list because it might contain 1 None entry which breaks the code.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a01720b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a01720b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a01720b2
Branch: refs/heads/master
Commit: a01720b25b301a5fd6eb3f8f8c7588727ac1aff7
Parents: 3ead9d7
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Fri Oct 23 16:01:17 2015 +0200
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Fri Oct 23 16:45:36 2015 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a01720b2/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index 6200d48..881cef2 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -71,7 +71,8 @@ class CsDhcp(CsDataBag):
# DNS search order
if gn.get_dns() and device:
sline = "dhcp-option=tag:interface-%s,6" % device
- line = "dhcp-option=tag:interface-%s,6,%s" % (device, ','.join(gn.get_dns()))
+ dns_list = [x for x in gn.get_dns() if x is not None]
+ line = "dhcp-option=tag:interface-%s,6,%s" % (device, ','.join(dns_list))
self.conf.search(sline, line)
# Gateway
gateway = ''