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

[Cory Johns]

Fixes for CWR
Also create separate -dev and -local bundle files.

[lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk]

22. By Cory Johns on 2015-09-16

Trivial (empty) merge of prod into dev to resolve merge conflicts

=== added file 'bundle-dev.yaml'
--- bundle-dev.yaml	1970-01-01 00:00:00 +0000
+++ bundle-dev.yaml	2015-09-16 20:23:38 +0000
@@ -0,0 +1,49 @@
+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=3G
+  hdfs-master:
+    charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "350"
+    constraints: mem=7G
+  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=7G
+  yarn-master:
+    charm: cs:~bigdata-dev/trusty/apache-hadoop-yarn-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "100"
+    constraints: mem=7G
+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]

=== added file 'bundle-local.yaml'
--- bundle-local.yaml	1970-01-01 00:00:00 +0000
+++ bundle-local.yaml	2015-09-16 20:23:38 +0000
@@ -0,0 +1,49 @@
+services:
+  client:
+    charm: local:trusty/apache-hadoop-client
+    num_units: 1
+    annotations:
+      gui-x: "1300"
+      gui-y: "200"
+  compute-slave:
+    charm: local:trusty/apache-hadoop-compute-slave
+    num_units: 3
+    annotations:
+      gui-x: "250"
+      gui-y: "200"
+    constraints: mem=3G
+  hdfs-master:
+    charm: local:trusty/apache-hadoop-hdfs-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "350"
+    constraints: mem=7G
+  plugin:
+    charm: local:trusty/apache-hadoop-plugin
+    annotations:
+      gui-x: "950"
+      gui-y: "200"
+  secondary-namenode:
+    charm: local:trusty/apache-hadoop-hdfs-secondary
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "600"
+    constraints: mem=7G
+  yarn-master:
+    charm: local:trusty/apache-hadoop-yarn-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "100"
+    constraints: mem=7G
+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 'bundle.yaml'
--- bundle.yaml	2015-09-15 20:03:43 +0000
+++ bundle.yaml	2015-09-16 20:23:38 +0000
@@ -20,7 +20,7 @@
       gui-y: "350"
     constraints: mem=7G
   plugin:
-    charm: cs:trusty/apache-hadoop-plugin-6
+    charm: cs:trusty/apache-hadoop-plugin-7
     annotations:
       gui-x: "950"
       gui-y: "200"