Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/status-removed into lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk

[Cory Johns]

Fixed status reporting not being accurate when relations were removed

[Kevin W Monroe (kwmonroe)]

LGTM, your bash is marvelous.

review: Approve

[lp:~bigdata-dev/charms/trusty/apache-hadoop-client/status-removed]

99. By Cory Johns on 2015-08-13

Added support for HDFS-only deployment

[Kevin W Monroe (kwmonroe)]

New drop to support hdfs-only status LGTM as well. Nice job, but next time, don't make me review twice :)

review: Approve

=== modified file 'hooks/hadoop-plugin-relation-changed'
--- hooks/hadoop-plugin-relation-changed	2015-05-11 22:25:12 +0000
+++ hooks/hadoop-plugin-relation-changed	2015-08-13 21:21:13 +0000
@@ -1,4 +1,10 @@
 #!/bin/bash
-if [[ "$(relation-get hdfs-ready)" == "True" ]]; then
+hdfs_ready="$(relation-get hdfs-ready)"
+yarn_ready="$(relation-get yarn-ready)"
+if [[ "$hdfs_ready" == "true" && "$yarn_ready" == "true" ]]; then
     hooks/status-set active "Ready to run mapreduce jobs"
+elif [[ "$hdfs_ready" == "true" ]]; then
+    hooks/status-set active "Ready (HDFS only)"
+else
+    hooks/status-set waiting "Waiting for Hadoop to be ready"
 fi
 
=== added file 'hooks/hadoop-plugin-relation-departed'
--- hooks/hadoop-plugin-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/hadoop-plugin-relation-departed	2015-08-13 21:21:13 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+hooks/status-set blocked "Please add relation to apache-hadoop-plugin"