bigdata-dev team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk into lp:charms/trusty/apache-flume-hdfs.

Requested reviews:
  charmers (charmers)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk/+merge/273433

Remove trivial test in favor of bundle tests.
-- 
Your team Juju Big Data Development is subscribed to branch lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk.

=== modified file 'actions/restart-flume'
--- actions/restart-flume	2015-09-17 18:51:10 +0000
+++ actions/restart-flume	2015-10-05 15:44:33 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -9
+ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9
 sleep 2
-su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs-conf/flume.conf -n a1"
+su flume -c "/usr/lib/flume-hdfs/bin/flume-ng agent -c /etc/flume-hdfs/conf -f /etc/flume-hdfs/conf/flume.conf -n a1"

=== modified file 'actions/stop-flume'
--- actions/stop-flume	2015-09-17 18:51:10 +0000
+++ actions/stop-flume	2015-10-05 15:44:33 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ps -ef | grep "flume-ng" | awk '{print $2}' | xargs kill -9
+ps -ef | grep "/usr/lib/flume-hdfs" | grep -v grep | awk '{print $2}' | xargs kill -9

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-07-28 20:18:23 +0000
+++ hooks/callbacks.py	2015-10-05 15:44:33 +0000
@@ -48,7 +48,7 @@
         self.verify_resources = utils.verify_resources(*self.resources.values())
 
     def is_installed(self):
-        return unitdata.kv().get('flume.installed')
+        return unitdata.kv().get('flume_hdfs.installed')
 
     def install(self, force=False):
         if not force and self.is_installed():
@@ -60,7 +60,7 @@
         self.dist_config.add_dirs()
         self.setup_flume_config()
         self.configure_flume()
-        unitdata.kv().set('flume.installed', True)
+        unitdata.kv().set('flume_hdfs.installed', True)
 
     def setup_flume_config(self):
         '''

=== removed file 'tests/00-setup'
--- tests/00-setup	2015-06-09 03:21:32 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo add-apt-repository ppa:juju/stable -y
-sudo apt-get update
-sudo apt-get install python3 amulet -y

=== renamed file 'tests/remote/test_dist_config.py' => 'tests/remote/test_dist_config.py.THIS'