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 2016/11/23 08:08:46 UTC
[1/3] git commit: updated refs/heads/4.9 to 1137a79
Repository: cloudstack
Updated Branches:
refs/heads/4.9 072af7a67 -> 1137a79cc
CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1
The VR executes a ip route flush command as part of configurations. This command performs a
DNS lookup on the VR hostname. Since the VR does not have a DNS entry, the ip command would
wait 5 seconds before timing out and executing the flush operation. This fix adds the VR
hostname to /etc/hosts mapped to 127.0.0.1 to answer the DNS lookup \u2013 reducing the
execution time.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c4696e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c4696e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c4696e5
Branch: refs/heads/4.9
Commit: 4c4696e5e43a870b7504dfde735bc3afd04a843e
Parents: b704cef
Author: Murali Reddy <mu...@gmail.com>
Authored: Thu Nov 10 13:25:22 2016 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Thu Nov 10 13:25:22 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c4696e5/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 3f102e6..7489650 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -44,7 +44,7 @@ class CsDhcp(CsDataBag):
continue
self.add(self.dbag[item])
self.write_hosts()
-
+
if self.cloud.is_changed():
self.delete_leases()
@@ -103,12 +103,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("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())
[3/3] git commit: updated refs/heads/4.9 to 1137a79
Posted by bh...@apache.org.
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 <ro...@shapeblue.com>
Authored: Wed Nov 23 13:38:11 2016 +0530
Committer: Rohit Yadav <ro...@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())
[2/3] git commit: updated refs/heads/4.9 to 1137a79
Posted by bh...@apache.org.
Merge pull request #1757 from murali-reddy/vr_dhcp_entries
CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1
The VR executes a ip route flush command as part of configurations. This command performs a
DNS lookup on the VR hostname. Since the VR does not have a DNS entry, the ip command would
wait 5 seconds before timing out and executing the flush operation. This fix adds the VR
hostname to /etc/hosts mapped to 127.0.0.1 to answer the DNS lookup reducing the
execution time.
* pr/1757:
CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b59a9b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b59a9b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b59a9b2
Branch: refs/heads/4.9
Commit: 3b59a9b2e497b6e41cca40cc3147a4cb0a3a52d8
Parents: 7f051bd 4c4696e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 23 13:33:56 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 23 13:33:56 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------