From eef07efe88486313ad71c6cbffece381934630d8 Mon Sep 17 00:00:00 2001
From: Brad Klein <bradley.klein@charter.com>
Date: Tue, 22 Nov 2016 11:20:01 -0700
Subject: [PATCH] Update for storm nimbus HA feature

Apache storm now supports nimbus.seeds option,
in which case the nimbus startup script should be
on all nodes, instead of only one in the cluster.

Change-Id: I660798e006605718035129758838e40ff1c972c3
---
 files/monasca_stack.sh    |  2 +-
 manifests/storm/config.pp | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/files/monasca_stack.sh b/files/monasca_stack.sh
index 903a5a2..d00bb77 100644
--- a/files/monasca_stack.sh
+++ b/files/monasca_stack.sh
@@ -19,7 +19,7 @@ get_up_list() {
 
     echo "zookeeper kafka storm-supervisor"
 
-    if grep nimbus.host $STORM_FILE | grep -e $(hostname) -e localhost > /dev/null
+    if grep nimbus.seeds $STORM_FILE | grep -e $(hostname) -e localhost > /dev/null
     then
         echo "storm-nimbus storm-ui monasca-thresh"
     fi
diff --git a/manifests/storm/config.pp b/manifests/storm/config.pp
index 255f179..dea1fec 100644
--- a/manifests/storm/config.pp
+++ b/manifests/storm/config.pp
@@ -19,9 +19,6 @@
 # [*log_dir*]
 #   directory for storm logs
 #
-# [*nimbus_server*]
-#   name of the nimbus server
-#
 class monasca::storm::config (
   $storm_version = 'apache-storm-0.9.3',
   $mirror = 'http://apache.arvixe.com/storm',
@@ -29,7 +26,6 @@ class monasca::storm::config (
   $storm_user = 'storm',
   $storm_group = 'storm',
   $log_dir = '/var/log/storm',
-  $nimbus_server = undef,
 ) {
   $cache_dir = '/var/cache/storm'
   $storm_local = '/storm-local'
@@ -104,13 +100,11 @@ class monasca::storm::config (
       storm_user        => $storm_user,
   }
 
-  if ($nimbus_server == 'localhost' or $nimbus_server == $::fqdn) {
-    File[$install_dir] -> File[$storm_local] ->
-    monasca::storm::startup_script {
-      '/etc/init.d/storm-nimbus':
-        storm_service     => 'nimbus',
-        storm_install_dir => "${install_dir}/current",
-        storm_user        => $storm_user,
-    }
+  File[$install_dir] -> File[$storm_local] ->
+  monasca::storm::startup_script {
+    '/etc/init.d/storm-nimbus':
+      storm_service     => 'nimbus',
+      storm_install_dir => "${install_dir}/current",
+      storm_user        => $storm_user,
   }
 }