cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [3/3] git commit: updated refs/heads/4.9 to 1137a79
Date Wed, 23 Nov 2016 08:08:48 GMT
Merge branch '4.8' into 4.9


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

Branch: refs/heads/4.9
Commit: 1137a79ccc17c3967c063efb05ac2f441c0564ef
Parents: 072af7a 3b59a9b
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Nov 23 13:38:11 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Nov 23 13:38:11 2016 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1137a79c/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index d97c04b,7489650..42ac880
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@@ -106,12 -103,10 +106,10 @@@ class CsDhcp(CsDataBag)
              return
  
      def preseed(self):
-         self.add_host("127.0.0.1", "localhost")
+         self.add_host("127.0.0.1", "localhost %s" % CsHelper.get_hostname())
 -        self.add_host("::1",     "localhost ip6-localhost ip6-loopback")
 +        self.add_host("::1", "localhost ip6-localhost ip6-loopback")
          self.add_host("ff02::1", "ip6-allnodes")
          self.add_host("ff02::2", "ip6-allrouters")
-         if self.config.is_vpc():
-             self.add_host("127.0.0.1", CsHelper.get_hostname())
          if self.config.is_router():
              self.add_host(self.config.address().get_guest_ip(), "%s data-server" % CsHelper.get_hostname())
  


Mime
View raw message