Fixing readme again, and waiting for tomcat to restart for Genie

README.md

@@ -209,9 +209,9 @@ _NOTES_:
     -  Use the 2.4.2 AMI
     -  Make sure the master node is at least an `m1.medium` so that Tomcat has enough RAM to run
     -  Get EMR to install Hive 0.11
-    -  Get EMR to Install Pig 0.11
+    -  Get EMR to Install Pig 0.11.1
 1.  Modify the `ElasticMapReduce-master` security group
-    - Allow port 7001 access from your IP address only
+    -  Allow port 7001 access from your IP address only
 1.  Go to the EC2 page, and set the `Name` tag of the master node to `Genie`
 1.  Confirm you can see the instance using the Ansible EC2 inventory
 
@@ -222,7 +222,7 @@ OK, you are now ready to install Genie on the master node of the EMR JobFlow.
     $ ansible-playbook playbooks/genie-hadoop-emr.yml -l 'tag_Name_Genie'
 
 This will configure the master node to be running the 
-https://netflixoss.ci.cloudbees.com/job/genie-master/lastSuccessfulBuild/artifact/genie-web/build/libs/genie-web-0.22-SNAPSHOT.war)
+[latest snapshot build](https://netflixoss.ci.cloudbees.com/job/genie-master/lastSuccessfulBuild/artifact/genie-web/build/libs/genie-web-0.22-SNAPSHOT.war)
 of Genie. If you prefer to build your own WAR file yourself, just specify the path to the WAR file:
 
     $ ansible-playbook playbooks/genie-hadoop-emr.yml -l 'tag_Name_Genie' -e "local_war=/path/to/genie.war"

playbooks/roles/genie/tasks/main.yml

@@ -2,7 +2,6 @@
 # Genie role
 - name: Copy tomcat server.xml file
   copy: src=server.xml dest=/usr/local/tomcat/conf/server.xml owner=root group=root mode=0644
-  notify: restart tomcat
 
 - name: Remove default root webapp
   file: path=/usr/local/tomcat/webapps/ROOT state=absent
@@ -19,7 +18,6 @@
   # This is because Derby DB needs to be created
 - name: Make tomcat directory writable by tomcat
   file: path=/var/lib/tomcat7 state=directory owner={{ tomcat_user }} group={{ tomcat_user }} mode=0755
-  tags: db
 
 - name: Ensure the pig.properties file exists
   # TODO: Replace with file state=touch after Ansible 1.4 is released
@@ -34,8 +32,11 @@
   get_url: url={{ latest_successful_build_url }} dest=/usr/local/tomcat/webapps/ROOT.war
   when: local_war == ""
   tags: deploy
-  notify: restart tomcat
-
+
+- name: Restart tomcat
+  service: name=tomcat7 state=restarted
+  tags: deploy
+
 - name: Clone Genie repository from GitHub
   git: repo={{ genie_repo }}
        dest=/home/hadoop/genie
@@ -44,12 +45,15 @@
   sudo_user: hadoop
   tags: clone
 
+- name: Wait for Tomcat to be available
+  wait_for: port=7001 delay=30
+
 - name: Register EMR cluster with Genie
   command: sudo -u hadoop -H -i /home/hadoop/genie/deploy/aws/emr_genie_postinstall.sh
   tags: reg
 
 
-# NOTES to myself
+# NOTES:
 #
 # If Tomcat fails with:
 #     SEVERE: Error listenerStart