From 16a0fbb02f539931a52b063a2c6017947dd50c91 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Fri, 18 Nov 2016 11:11:54 +0530 Subject: [PATCH] CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1 ensuring for both vpc and non vpc vr, both localhost and hostname is resolved to 127.0.0.1 --- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 3f102e6e28d..74896502ae1 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())