Resolve some issues about ansible scripts

1. Update README.md
2. More flexible HOME_LOCATION in ansible
3. Add some "automatic yes" in install.sh

Author: kansokusha

README.md

@@ -11,10 +11,12 @@ Feature
 
 Build OpenNet on your own - Use install.sh
 ------------------------------------------
-Support Ubuntu 14.04.1  
+Supports Ubuntu 14.04.1  
 
     $ git clone https://github.com/dlinknctu/OpenNet.git
-    $ sudo ./install.sh -a
+    $ cd OpenNet
+    $ sudo ./configure.sh
+    $ sudo ./install.sh master
     After a successful installation, the script will show "OpenNet installation complete."
 
 Run OpenNet
@@ -26,6 +28,8 @@ Please try following commands to run the simulation:
     # cd $ROOT_PATH/mininet/examples/opennet
     # python wifiroaming.py
 
+Do not add "sudo" at the head of the third line.  
+
 Run NetAnim
 -----------
 Use NetAnim to open the XML file in the directory /tmp/xml.  

ansible/group_vars/all

@@ -5,4 +5,3 @@ NS3_VERSION: 3.22
 PYGCCXML_VERSION: 1.0.0
 NETANIM_VERSION: 3.105
 temp_location: "/tmp"
-home_location: "/root/opennet"

ansible/roles/apt/tasks/main.yml

@@ -44,4 +44,5 @@
     - uuid-runtime
     - qt4-dev-tools
     - python-networkx
-  tags: apt
+    - librdmacm-dev
+  tags: apt

ansible/roles/help/templates/help.txt.j2

@@ -3,7 +3,7 @@ OpenNet installation complete.
 Before using OpenNet, you need to prepare SDN controller by yourself.
 =======================================================================
 Please try following commands to run the simulation
-$ ./waf_shell.sh
-$ cd {{ home_location }}/mininet/examples/opennet
-$ python wifiroaming.py
+$ sudo ./waf_shell.sh
+# cd {{ home_location }}/mininet/examples/opennet
+# python wifiroaming.py
 

ansible/roles/ns3/templates/waf_shell.sh.j2

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd "{{ home_location }}/ns-allinone-{{ NS3_VERSION }}/ns-{{ NS3_VERSION }}"
-./waf shell
+./waf shell

configure.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# This script can help users to configure the /etc/hosts file
+# Currently only support local installation
+
+set -e
+HOSTS_COMMENT='# The following lines are desirable for OpenNet'
+FIRST_LOCAL_IP=`ifconfig | grep inet | awk 'NR==1 {gsub("addr:","",$2); print $2}'`
+
+function LOCAL_INSTALL {
+    echo >> /etc/hosts
+    echo "$HOSTS_COMMENT" >> /etc/hosts
+    echo "$FIRST_LOCAL_IP	master" >> /etc/hosts
+}
+
+if [ $# -eq 0 ]; then
+    LOCAL_INSTALL
+    exit
+fi

install.sh

@@ -1,19 +1,18 @@
 #!/bin/bash
 
 set -e
-PWD=$(pwd)
-OPENNET_PATH=$HOME/opennet
+OPENNET_PATH=$PWD
 ANSIBLE_PATH=$OPENNET_PATH/ansible
 USERDIR=$HOME/.ssh
 user=$(whoami)
 
 function Install_Ansible {
 
     apt-get update
-    apt-get install software-properties-common
-    apt-add-repository ppa:ansible/ansible
+    apt-get install -y software-properties-common
+    apt-add-repository -y ppa:ansible/ansible
     apt-get update
-    apt-get install ansible
+    apt-get install -y ansible
 
 }
 
@@ -32,6 +31,7 @@ function SSH_Config_Setup {
     fi
     for host in $hosts; do
         echo "***copying public key to $host"
+        ssh-keyscan -H $host >> ~/.ssh/known_hosts
         ssh-copy-id -i $USERDIR/cluster_key.pub $user@$host &> /dev/null
         echo "***copying key pair to remote host"
         scp $USERDIR/{cluster_key,cluster_key.pub,config} $user@$host:$USERDIR
@@ -80,6 +80,7 @@ function Test_Network {
 function Install_OpenNet {
 
     cd $ANSIBLE_PATH
+    echo "home_location: \"$OPENNET_PATH\"\n" >> group_vars/all
     ansible-playbook playbook.yml
 
 }
@@ -125,4 +126,4 @@ SSH_Config_Setup
 SSH_Daemon_Setup
 Test_Network
 Install_OpenNet
-cat opennet_help.txt
+cat $OPENNET_PATH/opennet_help.txt