Juju Charms Collection
apache-hadoop-spark package

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

  1. Charm Bundles (0.0)
  2. trunk
  3. Merge into bundle
Proposed by Cory Johns
Status: Merged
Merged at revision: 4
Proposed branch: lp:~bigdata-dev/charms/bundles/apache-hadoop-spark/trunk
Merge into: lp:~charmers/charms/bundles/apache-hadoop-spark/bundle
Diff against target: 159 lines (+106/-6)
3 files modified
bundle-dev.yaml (+50/-0)
bundle-local.yaml (+50/-0)
bundle.yaml (+6/-6)
To merge this branch: bzr merge lp:~bigdata-dev/charms/bundles/apache-hadoop-spark/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Andrew McLeod (community) Approve
Review via email: mp+271474@code.launchpad.net

Description of the change

Tag charm revisions in bundle.

Also, add -dev and -local bundles.

To post a comment you must log in.
Revision history for this message
Andrew McLeod (admcleod) wrote :

+1

review: Approve
Revision history for this message
Kevin W Monroe (kwmonroe) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'bundle-dev.yaml'
2--- bundle-dev.yaml 1970-01-01 00:00:00 +0000
3+++ bundle-dev.yaml 2015-09-17 13:31:27 +0000
4@@ -0,0 +1,50 @@
5+services:
6+ compute-slave:
7+ charm: cs:~bigdata-dev/trusty/apache-hadoop-compute-slave
8+ num_units: 3
9+ annotations:
10+ gui-x: "300"
11+ gui-y: "200"
12+ constraints: mem=3G
13+ hdfs-master:
14+ charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
15+ num_units: 1
16+ annotations:
17+ gui-x: "600"
18+ gui-y: "350"
19+ constraints: mem=7G
20+ plugin:
21+ charm: cs:~bigdata-dev/trusty/apache-hadoop-plugin
22+ annotations:
23+ gui-x: "900"
24+ gui-y: "200"
25+ secondary-namenode:
26+ charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-secondary
27+ num_units: 1
28+ annotations:
29+ gui-x: "600"
30+ gui-y: "600"
31+ constraints: mem=7G
32+ spark:
33+ charm: cs:~bigdata-dev/trusty/apache-spark
34+ num_units: 1
35+ annotations:
36+ gui-x: "1200"
37+ gui-y: "200"
38+ constraints: mem=3G
39+ yarn-master:
40+ charm: cs:~bigdata-dev/trusty/apache-hadoop-yarn-master
41+ num_units: 1
42+ annotations:
43+ gui-x: "600"
44+ gui-y: "100"
45+ constraints: mem=7G
46+series: trusty
47+relations:
48+ - [yarn-master, hdfs-master]
49+ - [secondary-namenode, hdfs-master]
50+ - [compute-slave, yarn-master]
51+ - [compute-slave, hdfs-master]
52+ - [plugin, yarn-master]
53+ - [plugin, hdfs-master]
54+ - [spark, plugin]
55
56=== added file 'bundle-local.yaml'
57--- bundle-local.yaml 1970-01-01 00:00:00 +0000
58+++ bundle-local.yaml 2015-09-17 13:31:27 +0000
59@@ -0,0 +1,50 @@
60+services:
61+ compute-slave:
62+ charm: trusty/apache-hadoop-compute-slave
63+ num_units: 3
64+ annotations:
65+ gui-x: "300"
66+ gui-y: "200"
67+ constraints: mem=3G
68+ hdfs-master:
69+ charm: trusty/apache-hadoop-hdfs-master
70+ num_units: 1
71+ annotations:
72+ gui-x: "600"
73+ gui-y: "350"
74+ constraints: mem=7G
75+ plugin:
76+ charm: trusty/apache-hadoop-plugin
77+ annotations:
78+ gui-x: "900"
79+ gui-y: "200"
80+ secondary-namenode:
81+ charm: trusty/apache-hadoop-hdfs-secondary
82+ num_units: 1
83+ annotations:
84+ gui-x: "600"
85+ gui-y: "600"
86+ constraints: mem=7G
87+ spark:
88+ charm: trusty/apache-spark
89+ num_units: 1
90+ annotations:
91+ gui-x: "1200"
92+ gui-y: "200"
93+ constraints: mem=3G
94+ yarn-master:
95+ charm: trusty/apache-hadoop-yarn-master
96+ num_units: 1
97+ annotations:
98+ gui-x: "600"
99+ gui-y: "100"
100+ constraints: mem=7G
101+series: trusty
102+relations:
103+ - [yarn-master, hdfs-master]
104+ - [secondary-namenode, hdfs-master]
105+ - [compute-slave, yarn-master]
106+ - [compute-slave, hdfs-master]
107+ - [plugin, yarn-master]
108+ - [plugin, hdfs-master]
109+ - [spark, plugin]
110
111=== modified file 'bundle.yaml'
112--- bundle.yaml 2015-07-16 23:11:29 +0000
113+++ bundle.yaml 2015-09-17 13:31:27 +0000
114@@ -1,39 +1,39 @@
115 services:
116 compute-slave:
117- charm: cs:trusty/apache-hadoop-compute-slave
118+ charm: cs:trusty/apache-hadoop-compute-slave-8
119 num_units: 3
120 annotations:
121 gui-x: "300"
122 gui-y: "200"
123 constraints: mem=3G
124 hdfs-master:
125- charm: cs:trusty/apache-hadoop-hdfs-master
126+ charm: cs:trusty/apache-hadoop-hdfs-master-8
127 num_units: 1
128 annotations:
129 gui-x: "600"
130 gui-y: "350"
131 constraints: mem=7G
132 plugin:
133- charm: cs:trusty/apache-hadoop-plugin
134+ charm: cs:trusty/apache-hadoop-plugin-7
135 annotations:
136 gui-x: "900"
137 gui-y: "200"
138 secondary-namenode:
139- charm: cs:trusty/apache-hadoop-hdfs-secondary
140+ charm: cs:trusty/apache-hadoop-hdfs-secondary-6
141 num_units: 1
142 annotations:
143 gui-x: "600"
144 gui-y: "600"
145 constraints: mem=7G
146 spark:
147- charm: cs:trusty/apache-spark
148+ charm: cs:trusty/apache-spark-3
149 num_units: 1
150 annotations:
151 gui-x: "1200"
152 gui-y: "200"
153 constraints: mem=3G
154 yarn-master:
155- charm: cs:trusty/apache-hadoop-yarn-master
156+ charm: cs:trusty/apache-hadoop-yarn-master-6
157 num_units: 1
158 annotations:
159 gui-x: "600"

Subscribers

People subscribed via source and target branches