cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/6] git commit: updated refs/heads/master to b1c7d4b
Date Sat, 24 Oct 2015 07:16:20 GMT
CLOUDSTACK-8935 - Check if the key is available in the dictionary

   - This will fix the cleanup problems.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ca32dfc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ca32dfc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ca32dfc

Branch: refs/heads/master
Commit: 5ca32dfc8205a2847a274597c2e8fde36a85f624
Parents: 3725b3e
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Thu Oct 22 14:52:07 2015 +0200
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Thu Oct 22 14:52:07 2015 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ca32dfc/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py
index 4010007..e1afb92 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py
@@ -39,7 +39,7 @@ class CsGuestNetwork:
         if not self.guest:
             return self.config.get_dns()
         # Can a router provide dhcp but not dns?
-        if 'dns' in self.data:
+        if 'dns' in self.data and 'router_guest_gateway' in self.data:
             return [self.data['router_guest_gateway']] + self.data['dns'].split(',')
         elif "router_guest_gateway" in self.data:
             return [self.data['router_guest_gateway']]


Mime
View raw message