Juju Charms Collection
openstack-telemetry package

Merge lp:~james-page/charms/bundles/openstack-telemetry/bundle into lp:~charmers/charms/bundles/openstack-telemetry/bundle

  1. Charm Bundles (0.0)
  2. bundle
  3. Merge into bundle
Proposed by James Page
Status: Merged
Merged at revision: 32
Proposed branch: lp:~james-page/charms/bundles/openstack-telemetry/bundle
Merge into: lp:~charmers/charms/bundles/openstack-telemetry/bundle
Diff against target: 593 lines (+298/-278)
3 files modified
README.md (+1/-1)
bundle.yaml (+297/-0)
bundles.yaml (+0/-277)
To merge this branch: bzr merge lp:~james-page/charms/bundles/openstack-telemetry/bundle
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Liam Young (community) Approve
Review via email: mp+277799@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

I haven't deployed from the bundle but it looks good to me

review: Approve
lp:~james-page/charms/bundles/openstack-telemetry/bundle updated
33. By James Page

Fixup reference to base bundle

Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1455/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1440/

review: Needs Fixing (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-02-20 15:46:25 +0000
3+++ README.md 2015-11-18 11:22:44 +0000
4@@ -8,4 +8,4 @@
5
6 juju quickstart bundle:openstack-telemetry/openstack-telemetry
7
8-[Basic OpenStack Cloud]: http://jujucharms.com/openstack
9+[Basic OpenStack Cloud]: http://jujucharms.com/openstack-base
10
11=== added file 'bundle.yaml'
12--- bundle.yaml 1970-01-01 00:00:00 +0000
13+++ bundle.yaml 2015-11-18 11:22:44 +0000
14@@ -0,0 +1,297 @@
15+machines:
16+ '0':
17+ constraints: arch=amd64
18+ series: trusty
19+ '1':
20+ constraints: arch=amd64
21+ series: trusty
22+ '2':
23+ constraints: arch=amd64
24+ series: trusty
25+ '3':
26+ constraints: arch=amd64
27+ series: trusty
28+relations:
29+- - nova-compute:amqp
30+ - rabbitmq-server:amqp
31+- - neutron-gateway:amqp
32+ - rabbitmq-server:amqp
33+- - keystone:shared-db
34+ - mysql:shared-db
35+- - nova-cloud-controller:identity-service
36+ - keystone:identity-service
37+- - glance:identity-service
38+ - keystone:identity-service
39+- - neutron-api:identity-service
40+ - keystone:identity-service
41+- - neutron-openvswitch:neutron-plugin-api
42+ - neutron-api:neutron-plugin-api
43+- - neutron-api:shared-db
44+ - mysql:shared-db
45+- - neutron-api:amqp
46+ - rabbitmq-server:amqp
47+- - neutron-gateway:neutron-plugin-api
48+ - neutron-api:neutron-plugin-api
49+- - glance:shared-db
50+ - mysql:shared-db
51+- - glance:amqp
52+ - rabbitmq-server:amqp
53+- - nova-cloud-controller:image-service
54+ - glance:image-service
55+- - nova-compute:image-service
56+ - glance:image-service
57+- - nova-cloud-controller:cloud-compute
58+ - nova-compute:cloud-compute
59+- - nova-cloud-controller:amqp
60+ - rabbitmq-server:amqp
61+- - nova-cloud-controller:quantum-network-service
62+ - neutron-gateway:quantum-network-service
63+- - nova-compute:neutron-plugin
64+ - neutron-openvswitch:neutron-plugin
65+- - neutron-openvswitch:amqp
66+ - rabbitmq-server:amqp
67+- - openstack-dashboard:identity-service
68+ - keystone:identity-service
69+- - nova-cloud-controller:shared-db
70+ - mysql:shared-db
71+- - nova-cloud-controller:neutron-api
72+ - neutron-api:neutron-api
73+- - cinder:image-service
74+ - glance:image-service
75+- - cinder:amqp
76+ - rabbitmq-server:amqp
77+- - cinder:identity-service
78+ - keystone:identity-service
79+- - cinder:cinder-volume-service
80+ - nova-cloud-controller:cinder-volume-service
81+- - cinder-ceph:storage-backend
82+ - cinder:storage-backend
83+- - ceph:client
84+ - nova-compute:ceph
85+- - cinder:shared-db
86+ - mysql:shared-db
87+- - ceph:client
88+ - cinder-ceph:ceph
89+- - ceph:client
90+ - glance:ceph
91+- - ceph-osd:mon
92+ - ceph:osd
93+- - ntp:juju-info
94+ - nova-compute:juju-info
95+- - ntp:juju-info
96+ - neutron-gateway:juju-info
97+- - ceph-radosgw:mon
98+ - ceph:radosgw
99+- - ceph-radosgw:identity-service
100+ - keystone:identity-service
101+- - ceilometer:amqp
102+ - rabbitmq-server:amqp
103+- - ceilometer-agent:ceilometer-service
104+ - ceilometer:ceilometer-service
105+- - ceilometer:identity-service
106+ - keystone:identity-service
107+- - ceilometer:identity-notifications
108+ - keystone:identity-notifications
109+- - ceilometer-agent:nova-ceilometer
110+ - nova-compute:nova-ceilometer
111+- - ceilometer:shared-db
112+ - mongodb:database
113+series: trusty
114+services:
115+ ceilometer:
116+ annotations:
117+ gui-x: '1288.8744298356794'
118+ gui-y: '0.7040786325134718'
119+ charm: cs:trusty/ceilometer-15
120+ num_units: 1
121+ options:
122+ openstack-origin: cloud:trusty-liberty
123+ to:
124+ - lxc:2
125+ ceilometer-agent:
126+ annotations:
127+ gui-x: '1288.9999389648438'
128+ gui-y: '503'
129+ charm: cs:trusty/ceilometer-agent-11
130+ ceph:
131+ annotations:
132+ gui-x: '750'
133+ gui-y: '500'
134+ charm: cs:trusty/ceph-42
135+ num_units: 3
136+ options:
137+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
138+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
139+ osd-devices: /dev/sdb
140+ osd-reformat: 'yes'
141+ source: cloud:trusty-liberty
142+ to:
143+ - '1'
144+ - '2'
145+ - '3'
146+ ceph-osd:
147+ annotations:
148+ gui-x: '1000'
149+ gui-y: '500'
150+ charm: cs:trusty/ceph-osd-14
151+ num_units: 1
152+ options:
153+ osd-devices: /dev/sdb
154+ osd-reformat: 'yes'
155+ source: cloud:trusty-liberty
156+ to:
157+ - '0'
158+ ceph-radosgw:
159+ annotations:
160+ gui-x: '1000'
161+ gui-y: '250'
162+ charm: cs:trusty/ceph-radosgw-18
163+ num_units: 1
164+ options:
165+ source: cloud:trusty-liberty
166+ use-embedded-webserver: true
167+ to:
168+ - lxc:0
169+ cinder:
170+ annotations:
171+ gui-x: '750'
172+ gui-y: '0'
173+ charm: cs:trusty/cinder-31
174+ num_units: 1
175+ options:
176+ block-device: None
177+ glance-api-version: 2
178+ ha-mcastport: 5401
179+ openstack-origin: cloud:trusty-liberty
180+ to:
181+ - lxc:1
182+ cinder-ceph:
183+ annotations:
184+ gui-x: '750'
185+ gui-y: '250'
186+ charm: cs:trusty/cinder-ceph-14
187+ num_units: 0
188+ glance:
189+ annotations:
190+ gui-x: '250'
191+ gui-y: '0'
192+ charm: cs:trusty/glance-28
193+ num_units: 1
194+ options:
195+ ha-mcastport: 5402
196+ openstack-origin: cloud:trusty-liberty
197+ to:
198+ - lxc:2
199+ keystone:
200+ annotations:
201+ gui-x: '500'
202+ gui-y: '0'
203+ charm: cs:trusty/keystone-31
204+ num_units: 1
205+ options:
206+ admin-password: openstack
207+ ha-mcastport: 5403
208+ openstack-origin: cloud:trusty-liberty
209+ to:
210+ - lxc:3
211+ mongodb:
212+ annotations:
213+ gui-x: '1287.9999389648438'
214+ gui-y: '251.24996948242188'
215+ charm: cs:trusty/mongodb-28
216+ num_units: 1
217+ to:
218+ - lxc:1
219+ mysql:
220+ annotations:
221+ gui-x: '0'
222+ gui-y: '250'
223+ charm: cs:trusty/percona-cluster-31
224+ num_units: 1
225+ options:
226+ max-connections: 20000
227+ to:
228+ - lxc:0
229+ neutron-api:
230+ annotations:
231+ gui-x: '500'
232+ gui-y: '500'
233+ charm: cs:trusty/neutron-api-21
234+ num_units: 1
235+ options:
236+ neutron-security-groups: true
237+ openstack-origin: cloud:trusty-liberty
238+ to:
239+ - lxc:1
240+ neutron-gateway:
241+ annotations:
242+ gui-x: '0'
243+ gui-y: '0'
244+ charm: cs:trusty/neutron-gateway-7
245+ num_units: 1
246+ options:
247+ ext-port: eth1
248+ openstack-origin: cloud:trusty-liberty
249+ to:
250+ - '0'
251+ neutron-openvswitch:
252+ annotations:
253+ gui-x: '250'
254+ gui-y: '500'
255+ charm: cs:trusty/neutron-openvswitch-13
256+ num_units: 0
257+ nova-cloud-controller:
258+ annotations:
259+ gui-x: '0'
260+ gui-y: '500'
261+ charm: cs:trusty/nova-cloud-controller-64
262+ num_units: 1
263+ options:
264+ network-manager: Neutron
265+ openstack-origin: cloud:trusty-liberty
266+ quantum-security-groups: 'yes'
267+ to:
268+ - lxc:2
269+ nova-compute:
270+ annotations:
271+ gui-x: '250'
272+ gui-y: '250'
273+ charm: cs:trusty/nova-compute-33
274+ num_units: 3
275+ options:
276+ enable-live-migration: true
277+ enable-resize: true
278+ manage-neutron-plugin-legacy-mode: false
279+ migration-auth-type: ssh
280+ openstack-origin: cloud:trusty-liberty
281+ to:
282+ - '1'
283+ - '2'
284+ - '3'
285+ ntp:
286+ annotations:
287+ gui-x: '1000'
288+ gui-y: '0'
289+ charm: cs:trusty/ntp-14
290+ num_units: 0
291+ openstack-dashboard:
292+ annotations:
293+ gui-x: '500'
294+ gui-y: '-250'
295+ charm: cs:trusty/openstack-dashboard-19
296+ num_units: 1
297+ options:
298+ openstack-origin: cloud:trusty-liberty
299+ to:
300+ - lxc:3
301+ rabbitmq-server:
302+ annotations:
303+ gui-x: '500'
304+ gui-y: '250'
305+ charm: cs:trusty/rabbitmq-server-42
306+ num_units: 1
307+ options:
308+ source: cloud:trusty-liberty
309+ to:
310+ - lxc:0
311+
312
313=== removed file 'bundles.yaml'
314--- bundles.yaml 2015-02-20 16:26:27 +0000
315+++ bundles.yaml 1970-01-01 00:00:00 +0000
316@@ -1,277 +0,0 @@
317-openstack-telemetry:
318- services:
319- "cinder-ceph":
320- charm: "cs:trusty/cinder-ceph-4"
321- num_units: 0
322- annotations:
323- "gui-x": "750"
324- "gui-y": "250"
325- ntp:
326- charm: "cs:trusty/ntp-6"
327- num_units: 0
328- annotations:
329- "gui-x": "1000"
330- "gui-y": "0"
331- "ceph-radosgw":
332- charm: "cs:trusty/ceph-radosgw-9"
333- num_units: 1
334- options:
335- source: "cloud:trusty-juno"
336- "use-embedded-webserver": true
337- annotations:
338- "gui-x": "1000"
339- "gui-y": "250"
340- to:
341- - "lxc:ceph=1"
342- "openstack-dashboard":
343- charm: "cs:trusty/openstack-dashboard-8"
344- num_units: 1
345- options:
346- "openstack-origin": "cloud:trusty-juno"
347- annotations:
348- "gui-x": "500"
349- "gui-y": "-250"
350- to:
351- - "lxc:ceph=1"
352- "neutron-gateway":
353- charm: "cs:trusty/quantum-gateway-10"
354- num_units: 1
355- options:
356- "ext-port": eth1
357- "openstack-origin": "cloud:trusty-juno"
358- annotations:
359- "gui-x": "0"
360- "gui-y": "0"
361- to:
362- - "juju-gui=0"
363- cinder:
364- charm: "cs:trusty/cinder-12"
365- num_units: 1
366- options:
367- "block-device": None
368- "glance-api-version": 2
369- "openstack-origin": "cloud:trusty-juno"
370- annotations:
371- "gui-x": "750"
372- "gui-y": "0"
373- to:
374- - "lxc:ceph=2"
375- glance:
376- charm: "cs:trusty/glance-11"
377- num_units: 1
378- options:
379- "openstack-origin": "cloud:trusty-juno"
380- annotations:
381- "gui-x": "250"
382- "gui-y": "0"
383- to:
384- - "lxc:ceph=1"
385- keystone:
386- charm: "cs:trusty/keystone-14"
387- num_units: 1
388- options:
389- "admin-password": openstack
390- "openstack-origin": "cloud:trusty-juno"
391- annotations:
392- "gui-x": "500"
393- "gui-y": "0"
394- to:
395- - "lxc:ceph=0"
396- "nova-compute":
397- charm: "cs:trusty/nova-compute-14"
398- num_units: 3
399- options:
400- "enable-live-migration": true
401- "enable-resize": true
402- "migration-auth-type": ssh
403- "openstack-origin": "cloud:trusty-juno"
404- annotations:
405- "gui-x": "250"
406- "gui-y": "250"
407- to:
408- - ceph=0
409- - ceph=1
410- - ceph=2
411- "neutron-api":
412- charm: "cs:trusty/neutron-api-7"
413- num_units: 1
414- options:
415- "neutron-security-groups": true
416- "openstack-origin": "cloud:trusty-juno"
417- annotations:
418- "gui-x": "500"
419- "gui-y": "500"
420- to:
421- - "lxc:ceph=0"
422- "neutron-openvswitch":
423- charm: "cs:trusty/neutron-openvswitch-2"
424- num_units: 0
425- annotations:
426- "gui-x": "250"
427- "gui-y": "500"
428- ceph:
429- charm: "cs:trusty/ceph-34"
430- num_units: 3
431- options:
432- fsid: "5a791d94-980b-11e4-b6f6-3c970e8b1cf7"
433- "monitor-secret": AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
434- "osd-devices": /dev/sdb
435- "osd-reformat": "yes"
436- source: "cloud:trusty-juno"
437- annotations:
438- "gui-x": "750"
439- "gui-y": "500"
440- "ceph-osd":
441- charm: "cs:trusty/ceph-osd-8"
442- num_units: 1
443- options:
444- "osd-devices": /dev/sdb
445- "osd-reformat": "yes"
446- source: "cloud:trusty-juno"
447- annotations:
448- "gui-x": "1000"
449- "gui-y": "500"
450- to:
451- - "juju-gui=0"
452- mysql:
453- charm: "cs:trusty/mysql-18"
454- num_units: 1
455- options:
456- "max-connections": 20000
457- annotations:
458- "gui-x": "0"
459- "gui-y": "250"
460- to:
461- - "lxc:juju-gui=0"
462- "rabbitmq-server":
463- charm: "cs:trusty/rabbitmq-server-26"
464- num_units: 1
465- annotations:
466- "gui-x": "500"
467- "gui-y": "250"
468- to:
469- - "lxc:juju-gui=0"
470- "nova-cloud-controller":
471- charm: "cs:trusty/nova-cloud-controller-51"
472- num_units: 1
473- options:
474- "network-manager": Neutron
475- "openstack-origin": "cloud:trusty-juno"
476- "quantum-security-groups": "yes"
477- annotations:
478- "gui-x": "0"
479- "gui-y": "500"
480- to:
481- - "lxc:ceph=2"
482- ceilometer:
483- charm: "cs:trusty/ceilometer-3"
484- num_units: 1
485- options:
486- "openstack-origin": "cloud:trusty-juno"
487- annotations:
488- "gui-x": "1288.8744298356794"
489- "gui-y": "0.7040786325134718"
490- to:
491- - "lxc:ceph=2"
492- "ceilometer-agent":
493- charm: "cs:trusty/ceilometer-agent-3"
494- num_units: 0
495- annotations:
496- "gui-x": "1288.9999389648438"
497- "gui-y": "503"
498- mongodb:
499- charm: "cs:trusty/mongodb-16"
500- num_units: 1
501- annotations:
502- "gui-x": "1287.9999389648438"
503- "gui-y": "251.24996948242188"
504- to:
505- - "lxc:ceph=0"
506- relations:
507- - - "nova-compute:amqp"
508- - "rabbitmq-server:amqp"
509- - - "neutron-gateway:amqp"
510- - "rabbitmq-server:amqp"
511- - - "keystone:shared-db"
512- - "mysql:shared-db"
513- - - "nova-cloud-controller:identity-service"
514- - "keystone:identity-service"
515- - - "glance:identity-service"
516- - "keystone:identity-service"
517- - - "neutron-api:identity-service"
518- - "keystone:identity-service"
519- - - "neutron-openvswitch:neutron-plugin-api"
520- - "neutron-api:neutron-plugin-api"
521- - - "neutron-api:shared-db"
522- - "mysql:shared-db"
523- - - "neutron-api:amqp"
524- - "rabbitmq-server:amqp"
525- - - "neutron-gateway:neutron-plugin-api"
526- - "neutron-api:neutron-plugin-api"
527- - - "glance:shared-db"
528- - "mysql:shared-db"
529- - - "glance:amqp"
530- - "rabbitmq-server:amqp"
531- - - "nova-cloud-controller:image-service"
532- - "glance:image-service"
533- - - "nova-compute:image-service"
534- - "glance:image-service"
535- - - "nova-cloud-controller:cloud-compute"
536- - "nova-compute:cloud-compute"
537- - - "nova-cloud-controller:amqp"
538- - "rabbitmq-server:amqp"
539- - - "nova-cloud-controller:quantum-network-service"
540- - "neutron-gateway:quantum-network-service"
541- - - "nova-compute:neutron-plugin"
542- - "neutron-openvswitch:neutron-plugin"
543- - - "neutron-openvswitch:amqp"
544- - "rabbitmq-server:amqp"
545- - - "openstack-dashboard:identity-service"
546- - "keystone:identity-service"
547- - - "nova-cloud-controller:shared-db"
548- - "mysql:shared-db"
549- - - "nova-cloud-controller:neutron-api"
550- - "neutron-api:neutron-api"
551- - - "cinder:image-service"
552- - "glance:image-service"
553- - - "cinder:amqp"
554- - "rabbitmq-server:amqp"
555- - - "cinder:identity-service"
556- - "keystone:identity-service"
557- - - "cinder:cinder-volume-service"
558- - "nova-cloud-controller:cinder-volume-service"
559- - - "cinder-ceph:storage-backend"
560- - "cinder:storage-backend"
561- - - "ceph:client"
562- - "nova-compute:ceph"
563- - - "cinder:shared-db"
564- - "mysql:shared-db"
565- - - "ceph:client"
566- - "cinder-ceph:ceph"
567- - - "ceph:client"
568- - "glance:ceph"
569- - - "ceph-osd:mon"
570- - "ceph:osd"
571- - - "ntp:juju-info"
572- - "nova-compute:juju-info"
573- - - "ntp:juju-info"
574- - "neutron-gateway:juju-info"
575- - - "ntp:juju-info"
576- - "ceph-osd:juju-info"
577- - - "ceph-radosgw:mon"
578- - "ceph:radosgw"
579- - - "ceph-radosgw:identity-service"
580- - "keystone:identity-service"
581- - - "ceilometer:amqp"
582- - "rabbitmq-server:amqp"
583- - - "ceilometer-agent:ceilometer-service"
584- - "ceilometer:ceilometer-service"
585- - - "ceilometer:identity-service"
586- - "keystone:identity-service"
587- - - "ceilometer:identity-notifications"
588- - "keystone:identity-notifications"
589- - - "ceilometer-agent:nova-ceilometer"
590- - "nova-compute:nova-ceilometer"
591- - - "ceilometer:shared-db"
592- - "mongodb:database"
593- series: trusty

Subscribers

People subscribed via source and target branches