Merge lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/v4-only into lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk

[Cory Johns]

Fixes for CWR

[amir sanjar (asanjar)]

review: Approve

[Andrew McLeod (admcleod)]

^^ Redundant comment diff-line 87

=== removed file 'bundles_v3.yaml'
--- bundles_v3.yaml	2015-07-20 20:54:16 +0000
+++ bundles_v3.yaml	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-bundle:
-  services:
-    client:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-client
-      num_units: 1
-      annotations:
-        gui-x: "1300"
-        gui-y: "200"
-    compute-slave:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-compute-slave
-      num_units: 3
-      annotations:
-        gui-x: "250"
-        gui-y: "200"
-      constraints: mem=4G
-    hdfs-master:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
-      num_units: 1
-      annotations:
-        gui-x: "600"
-        gui-y: "350"
-      constraints: mem=8G
-    plugin:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-plugin
-      annotations:
-        gui-x: "950"
-        gui-y: "200"
-    secondary-namenode:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-secondary
-      num_units: 1
-      annotations:
-        gui-x: "600"
-        gui-y: "600"
-      constraints: mem=8G
-    yarn-master:
-      charm: cs:~bigdata-dev/trusty/apache-hadoop-yarn-master
-      num_units: 1
-      annotations:
-        gui-x: "600"
-        gui-y: "100"
-      constraints: mem=8G
-  series: trusty
-  relations:
-    - [yarn-master, hdfs-master]
-    - [secondary-namenode, hdfs-master]
-    - [compute-slave, yarn-master]
-    - [compute-slave, hdfs-master]
-    - [plugin, yarn-master]
-    - [plugin, hdfs-master]
-    - [client, plugin]

=== modified file 'tests/00-setup'
--- tests/00-setup	2015-03-04 17:07:52 +0000
+++ tests/00-setup	2015-09-15 14:35:41 +0000
@@ -1,8 +1,18 @@
 #!/bin/bash
 
+to_install=''
+
 if ! dpkg -s 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
+    to_install="$to_install amulet"
+fi
+
+if ! dpkg -s python3-yaml &> /dev/null; then
+    to_install="$to_install python3-yaml"
+fi
+
+if [[ -n "$to_install" ]]; then
+    echo Installing $to_install...
+    sudo apt-get install $to_install
 fi

=== modified file 'tests/01-bundle.py'
--- tests/01-bundle.py	2015-07-20 20:54:16 +0000
+++ tests/01-bundle.py	2015-09-15 14:35:41 +0000
@@ -13,7 +13,7 @@
     Base class for tests for Apache Hadoop Bundle.
     """
     # have to use the v3 format because that's what amulet supports
-    bundle_file = os.path.join(os.path.dirname(__file__), '..', 'bundles_v3.yaml')
+    bundle_file = os.path.join(os.path.dirname(__file__), '..', 'bundle.yaml')
     profile_name = None
 
     @classmethod