Merge lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle

[Kevin W Monroe]

fixup tests

[lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle]

10. By Cory Johns on 2015-10-07

Updated to latest charm revisions

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-10-02 19:58:46 +0000
+++ bundle.yaml	2015-10-07 21:32:01 +0000
@@ -1,32 +1,32 @@
 services:
   compute-slave:
-    charm: cs:trusty/apache-hadoop-compute-slave-8
+    charm: cs:trusty/apache-hadoop-compute-slave-9
     num_units: 3
     annotations:
       gui-x: "300"
       gui-y: "200"
     constraints: mem=3G
   flume-hdfs:
-    charm: cs:trusty/apache-flume-hdfs-3
+    charm: cs:trusty/apache-flume-hdfs-4
     num_units: 1
     annotations:
       gui-x: "1200"
       gui-y: "350"
   flume-syslog:
-    charm: cs:trusty/apache-flume-syslog-2
+    charm: cs:trusty/apache-flume-syslog-3
     num_units: 1
     annotations:
       gui-x: "1200"
       gui-y: "600"
   hdfs-master:
-    charm: cs:trusty/apache-hadoop-hdfs-master-8
+    charm: cs:trusty/apache-hadoop-hdfs-master-9
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "350"
     constraints: mem=7G
   plugin:
-    charm: cs:trusty/apache-hadoop-plugin-7
+    charm: cs:trusty/apache-hadoop-plugin-8
     annotations:
       gui-x: "900"
       gui-y: "200"
@@ -36,28 +36,28 @@
       gui-x: "900"
       gui-y: "600"
   secondary-namenode:
-    charm: cs:trusty/apache-hadoop-hdfs-secondary-6
+    charm: cs:trusty/apache-hadoop-hdfs-secondary-7
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "600"
     constraints: mem=7G
   spark:
-    charm: cs:trusty/apache-spark-2
+    charm: cs:trusty/apache-spark-4
     num_units: 1
     annotations:
       gui-x: "1200"
       gui-y: "100"
     constraints: mem=7G
   yarn-master:
-    charm: cs:trusty/apache-hadoop-yarn-master-6
+    charm: cs:trusty/apache-hadoop-yarn-master-7
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "100"
     constraints: mem=7G
   zeppelin:
-    charm: cs:trusty/apache-zeppelin-4
+    charm: cs:trusty/apache-zeppelin-5
     annotations:
       gui-x: "1500"
       gui-y: "100"
 
=== removed file 'tests/00-setup'
--- tests/00-setup	2015-10-02 19:02:34 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if ! python3 -c 'import amulet' &> /dev/null; then
-    echo Installing Amulet...
-    sudo add-apt-repository -y ppa:juju/stable
-    sudo apt-get update
-    sudo apt-get -y install amulet
-fi
 
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-10-07 21:32:01 +0000
@@ -0,0 +1,3 @@
+reset: false
+packages:
+  - amulet