Merge lp:~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk into lp:~charmers/charms/bundles/apache-hadoop-spark-zeppelin/bundle

[Cory Johns]

Tag charm revisions in bundle.

Also, add -dev and -local bundles.

[amir sanjar (asanjar)]

+1

=== added file 'bundle-dev.yaml'
--- bundle-dev.yaml	1970-01-01 00:00:00 +0000
+++ bundle-dev.yaml	2015-09-17 13:18:33 +0000
@@ -0,0 +1,56 @@
+services:
+  compute-slave:
+    charm: cs:~bigdata-dev/trusty/apache-hadoop-compute-slave
+    num_units: 3
+    annotations:
+      gui-x: "300"
+      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: "900"
+      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
+  spark:
+    charm: cs:~bigdata-dev/trusty/apache-spark
+    num_units: 1
+    annotations:
+      gui-x: "1200"
+      gui-y: "200"
+    constraints: mem=3G
+  yarn-master:
+    charm: cs:~bigdata-dev/trusty/apache-hadoop-yarn-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "100"
+    constraints: mem=7G
+  zeppelin:
+    charm: cs:~bigdata-dev/trusty/apache-zeppelin
+    annotations:
+      gui-x: "1200"
+      gui-y: "450"
+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]
+  - [spark, plugin]
+  - [spark, zeppelin]

=== added file 'bundle-local.yaml'
--- bundle-local.yaml	1970-01-01 00:00:00 +0000
+++ bundle-local.yaml	2015-09-17 13:18:33 +0000
@@ -0,0 +1,56 @@
+services:
+  compute-slave:
+    charm: trusty/apache-hadoop-compute-slave
+    num_units: 3
+    annotations:
+      gui-x: "300"
+      gui-y: "200"
+    constraints: mem=3G
+  hdfs-master:
+    charm: trusty/apache-hadoop-hdfs-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "350"
+    constraints: mem=7G
+  plugin:
+    charm: trusty/apache-hadoop-plugin
+    annotations:
+      gui-x: "900"
+      gui-y: "200"
+  secondary-namenode:
+    charm: trusty/apache-hadoop-hdfs-secondary
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "600"
+    constraints: mem=7G
+  spark:
+    charm: trusty/apache-spark
+    num_units: 1
+    annotations:
+      gui-x: "1200"
+      gui-y: "200"
+    constraints: mem=3G
+  yarn-master:
+    charm: trusty/apache-hadoop-yarn-master
+    num_units: 1
+    annotations:
+      gui-x: "600"
+      gui-y: "100"
+    constraints: mem=7G
+  zeppelin:
+    charm: trusty/apache-zeppelin
+    annotations:
+      gui-x: "1200"
+      gui-y: "450"
+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]
+  - [spark, plugin]
+  - [spark, zeppelin]

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-07-17 02:55:56 +0000
+++ bundle.yaml	2015-09-17 13:18:33 +0000
@@ -1,46 +1,46 @@
 services:
   compute-slave:
-    charm: cs:trusty/apache-hadoop-compute-slave
+    charm: cs:trusty/apache-hadoop-compute-slave-8
     num_units: 3
     annotations:
       gui-x: "300"
       gui-y: "200"
     constraints: mem=3G
   hdfs-master:
-    charm: cs:trusty/apache-hadoop-hdfs-master
+    charm: cs:trusty/apache-hadoop-hdfs-master-8
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "350"
     constraints: mem=7G
   plugin:
-    charm: cs:trusty/apache-hadoop-plugin
+    charm: cs:trusty/apache-hadoop-plugin-7
     annotations:
       gui-x: "900"
       gui-y: "200"
   secondary-namenode:
-    charm: cs:trusty/apache-hadoop-hdfs-secondary
+    charm: cs:trusty/apache-hadoop-hdfs-secondary-6
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "600"
     constraints: mem=7G
   spark:
-    charm: cs:trusty/apache-spark
+    charm: cs:trusty/apache-spark-3
     num_units: 1
     annotations:
       gui-x: "1200"
       gui-y: "200"
     constraints: mem=3G
   yarn-master:
-    charm: cs:trusty/apache-hadoop-yarn-master
+    charm: cs:trusty/apache-hadoop-yarn-master-6
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "100"
     constraints: mem=7G
   zeppelin:
-    charm: cs:trusty/apache-zeppelin
+    charm: cs:trusty/apache-zeppelin-3
     annotations:
       gui-x: "1200"
       gui-y: "450"