Merge lp:~xianghui/charms/precise/hadoop/fix-dnsdomainname-unknown into lp:~charmers/charms/precise/hadoop/trunk

[Xiang Hui]

Fix dnsdomainname: Name or service not known error.

[Jonathan Davies (jpds)]

+1.

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

Thanks for the fix!

review: Approve

[Xiang Hui (xianghui)]

Thanks Charles !

On Tue, Jun 10, 2014 at 11:19 PM, Charles Butler <
<email address hidden>> wrote:

> Review: Approve
>
> +1 LGTM
>
> Thanks for the fix!
> --
>
> https://code.launchpad.net/~xianghui/charms/precise/hadoop/fix-dnsdomainname-unknown/+merge/213774
> You are the owner of
> lp:~xianghui/charms/precise/hadoop/fix-dnsdomainname-unknown.
>

=== modified file 'hooks/hadoop-common'
--- hooks/hadoop-common	2013-10-03 06:37:01 +0000
+++ hooks/hadoop-common	2014-04-02 07:51:53 +0000
@@ -11,12 +11,15 @@
     # Fixup stuff in lxc containers
     hostname=`hostname`
     grep -q "^127.0.0.1.*$hostname" /etc/hosts &&
-        sed -i -e "s/^\(127.0.0.1 .*\)$hostname/\1/" /etc/hosts &&
-        echo "$private_address $hostname" >> /etc/hosts
+        sed -i -e "s/^\(127.0.0.1 .*\)$hostname/\1/" /etc/hosts 
+    
+    #It's better to record the private_address in /etc/hosts, otherwise
+    #dnsdomainname will return an error which makes install failed.
+    echo "$private_address $hostname" >> /etc/hosts
 
     # only necessary on oneiric but shouldn't break anything elsewhere
     hostname=`hostname -f`
-    sed -i -e "s/^127.0.1.1\(.*$hostname.*\)/$private_address\1/" /etc/hosts
+    sed -i -e "s/^127.0.0.1\(.*$hostname.*\)/$private_address\1/" /etc/hosts
 }
 
 # Helpers to support conditional restarts based

=== modified file 'revision'
--- revision	2012-05-03 22:05:16 +0000
+++ revision	2014-04-02 07:51:53 +0000
@@ -1,1 +1,1 @@
-16
+17