OpenStack Charm Testing

Merge lp:~james-page/openstack-charm-testing/16.04-release into lp:openstack-charm-testing

  1. 16.04-release
  2. Merge into trunk
Proposed by James Page on 2016-04-21
Status: Merged
Merged at revision: 204
Proposed branch: lp:~james-page/openstack-charm-testing/16.04-release
Merge into: lp:openstack-charm-testing
Diff against target: 1512 lines (+198/-209)
28 files modified
bundles/0mq/0mq.yaml (+0/-1)
bundles/baremetal/7-default.yaml (+24/-25)
bundles/baremetal/7-next.yaml (+1/-1)
bundles/baremetal/basic-default.yaml (+0/-1)
bundles/cells/cells-api.yaml (+0/-1)
bundles/cells/cells-cell1.yaml (+0/-1)
bundles/cells/cells-cell11.yaml (+0/-1)
bundles/cells/cells-cell2.yaml (+0/-1)
bundles/dev/11-default.yaml (+20/-21)
bundles/dev/hacluster-keystone-default.yaml (+1/-1)
bundles/dev/icehouse.yaml (+0/-1)
bundles/dev/neutron-breakout.yaml (+0/-1)
bundles/dev/ssl-everywhere.yaml (+0/-1)
bundles/keystone-v3/next.yaml (+1/-1)
bundles/leadership-election/leadership-election.yaml (+1/-2)
bundles/lxd/default.yaml (+26/-18)
bundles/lxd/source/default.yaml (+17/-18)
bundles/multi-hypervisor/default.yaml (+21/-22)
bundles/nsx/nsx.yaml (+11/-12)
bundles/ovs-odl/ovs-odl.yaml (+1/-1)
bundles/ppc64/deprecated/ppc64el-two-unit-method1.yaml (+0/-1)
bundles/ppc64/deprecated/ppc64el-two-unit-method2.yaml (+0/-1)
bundles/ppc64/powerkvm-fullstack.yaml (+16/-16)
bundles/ppc64/powerkvm-two-unit-dense.yaml (+10/-10)
bundles/source/default.yaml (+23/-24)
bundles/source/next.yaml (+1/-1)
bundles/sparse/default.yaml (+23/-24)
bundles/sparse/next.yaml (+1/-1)
To merge this branch: bzr merge lp:~james-page/openstack-charm-testing/16.04-release
Reviewer Review Type Date Requested Status
Ryan Beisner 2016-04-21 Approve on 2016-04-21
Review via email: mp+292497@code.launchpad.net

Description of the Change

Updates for 16.04 charm release.

To post a comment you must log in.
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/0mq/0mq.yaml'
2--- bundles/0mq/0mq.yaml 2016-03-11 09:33:21 +0000
3+++ bundles/0mq/0mq.yaml 2016-04-21 10:53:55 +0000
4@@ -37,7 +37,6 @@
5 constraints: mem=1G
6 options:
7 network-manager: Neutron
8- quantum-security-groups: "yes"
9 neutron-gateway:
10 branch: https://github.com/openstack/charm-neutron-gateway
11 constraints: mem=1G
12
13=== modified file 'bundles/baremetal/7-default.yaml'
14--- bundles/baremetal/7-default.yaml 2016-03-31 03:40:44 +0000
15+++ bundles/baremetal/7-default.yaml 2016-04-21 10:53:55 +0000
16@@ -9,18 +9,18 @@
17 openstack-services:
18 services:
19 mysql:
20- branch: https://github.com/openstack/charm-percona-cluster;stable
21+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
22 options:
23 dataset-size: 50%
24 max-connections: 20000
25 to:
26 - "0"
27 rabbitmq-server:
28- branch: https://github.com/openstack/charm-rabbitmq-server;stable
29+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
30 to:
31 - "lxc:0"
32 ceph:
33- branch: https://github.com/openstack/charm-ceph;stable
34+ branch: https://github.com/openstack/charm-ceph;stable/16.04
35 num_units: 3
36 options:
37 fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
38@@ -32,14 +32,14 @@
39 - "nova-compute=1"
40 - "nova-compute=2"
41 ceph-osd:
42- branch: https://github.com/openstack/charm-ceph-osd;stable
43+ branch: https://github.com/openstack/charm-ceph-osd;stable/16.04
44 options:
45 osd-devices: /dev/vdb /dev/sdb
46 osd-reformat: "yes"
47 to:
48 - "0"
49 swift-proxy:
50- branch: https://github.com/openstack/charm-swift-proxy;stable
51+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
52 options:
53 zone-assignment: manual
54 replicas: 3
55@@ -47,76 +47,75 @@
56 to:
57 - "lxc:0"
58 swift-storage-z1:
59- branch: https://github.com/openstack/charm-swift-storage;stable
60+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
61 options:
62 zone: 1
63 block-device: /dev/vdb /dev/sdb
64 overwrite: "true"
65 swift-storage-z2:
66- branch: https://github.com/openstack/charm-swift-storage;stable
67+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
68 options:
69 zone: 2
70 block-device: /dev/vdb /dev/sdb
71 overwrite: "true"
72 swift-storage-z3:
73- branch: https://github.com/openstack/charm-swift-storage;stable
74+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
75 options:
76 zone: 3
77 block-device: /dev/vdb /dev/sdb
78 overwrite: "true"
79 keystone:
80- branch: https://github.com/openstack/charm-keystone;stable
81+ branch: https://github.com/openstack/charm-keystone;stable/16.04
82 options:
83 admin-password: openstack
84 admin-token: ubuntutesting
85 to:
86 - "lxc:swift-storage-z1=0"
87 openstack-dashboard:
88- branch: https://github.com/openstack/charm-openstack-dashboard;stable
89+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
90 to:
91 - "lxc:swift-storage-z2=0"
92 nova-compute:
93- branch: https://github.com/openstack/charm-nova-compute;stable
94+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
95 num_units: 3
96 options:
97 enable-live-migration: True
98 enable-resize: True
99 migration-auth-type: ssh
100 nova-cloud-controller:
101- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
102+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
103 options:
104 network-manager: Neutron
105- quantum-security-groups: "yes"
106 to:
107 - "lxc:swift-storage-z3=0"
108 neutron-gateway:
109- branch: https://github.com/openstack/charm-neutron-gateway;stable
110+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
111 options:
112 ext-port: eth1
113 instance-mtu: 1300
114 to:
115 - "0"
116 cinder:
117- branch: https://github.com/openstack/charm-cinder;stable
118+ branch: https://github.com/openstack/charm-cinder;stable/16.04
119 options:
120 block-device: "None"
121 glance-api-version: 2
122 to:
123 - "lxc:nova-compute=2"
124 cinder-ceph:
125- branch: https://github.com/openstack/charm-cinder-ceph;stable
126+ branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
127 glance:
128- branch: https://github.com/openstack/charm-glance;stable
129+ branch: https://github.com/openstack/charm-glance;stable/16.04
130 to:
131 - "lxc:nova-compute=1"
132 ceilometer:
133- branch: https://github.com/openstack/charm-ceilometer;stable
134+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
135 to:
136 - "lxc:swift-storage-z1=0"
137 ceilometer-agent:
138- branch: https://github.com/openstack/charm-ceilometer-agent;stable
139+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
140 heat:
141- branch: https://github.com/openstack/charm-heat;stable
142+ branch: https://github.com/openstack/charm-heat;stable/16.04
143 to:
144 - "lxc:swift-storage-z2=0"
145 mongodb:
146@@ -183,13 +182,13 @@
147 inherits: openstack-singlerabbit
148 services:
149 neutron-api:
150- branch: https://github.com/openstack/charm-neutron-api;stable
151+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
152 options:
153 neutron-security-groups: True
154 to:
155 - "lxc:nova-compute=0"
156 neutron-openvswitch:
157- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
158+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
159 relations:
160 - [ neutron-api, mysql ]
161 - [ neutron-api, rabbitmq-server ]
162@@ -203,13 +202,13 @@
163 inherits: openstack-services
164 services:
165 neutron-api:
166- branch: https://github.com/openstack/charm-neutron-api;stable
167+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
168 options:
169 neutron-security-groups: True
170 neutron-openvswitch:
171- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
172+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
173 rabbitmq-server-neutron:
174- branch: https://github.com/openstack/charm-rabbitmq-server;stable
175+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
176 relations:
177 - [ neutron-api, mysql ]
178 - [ neutron-api, rabbitmq-server-neutron ]
179
180=== modified file 'bundles/baremetal/7-next.yaml'
181--- bundles/baremetal/7-next.yaml 2016-04-18 14:19:17 +0000
182+++ bundles/baremetal/7-next.yaml 2016-04-21 10:53:55 +0000
183@@ -208,7 +208,7 @@
184 neutron-openvswitch:
185 branch: https://github.com/openstack/charm-neutron-openvswitch
186 rabbitmq-server-neutron:
187- branch: https://github.com/openstack/charm-rabbitmq-server;stable
188+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
189 relations:
190 - [ neutron-api, mysql ]
191 - [ neutron-api, rabbitmq-server-neutron ]
192
193=== modified file 'bundles/baremetal/basic-default.yaml'
194--- bundles/baremetal/basic-default.yaml 2016-03-11 09:33:21 +0000
195+++ bundles/baremetal/basic-default.yaml 2016-04-21 10:53:55 +0000
196@@ -86,7 +86,6 @@
197 options:
198 "network-manager": Neutron
199 "openstack-origin": "cloud:trusty-juno"
200- "quantum-security-groups": "yes"
201 annotations:
202 "gui-x": "0"
203 "gui-y": "500"
204
205=== modified file 'bundles/cells/cells-api.yaml'
206--- bundles/cells/cells-api.yaml 2016-03-08 09:44:01 +0000
207+++ bundles/cells/cells-api.yaml 2016-04-21 10:53:55 +0000
208@@ -12,7 +12,6 @@
209 constraints: mem=1G
210 options:
211 network-manager: Quantum
212- quantum-security-groups: "yes"
213 verbose: True
214 debug: True
215 neutron-api:
216
217=== modified file 'bundles/cells/cells-cell1.yaml'
218--- bundles/cells/cells-cell1.yaml 2014-10-24 10:48:06 +0000
219+++ bundles/cells/cells-cell1.yaml 2016-04-21 10:53:55 +0000
220@@ -6,7 +6,6 @@
221 constraints: mem=1G
222 options:
223 network-manager: Quantum
224- quantum-security-groups: "yes"
225 region: cell1
226 verbose: True
227 debug: True
228
229=== modified file 'bundles/cells/cells-cell11.yaml'
230--- bundles/cells/cells-cell11.yaml 2014-10-24 10:48:06 +0000
231+++ bundles/cells/cells-cell11.yaml 2016-04-21 10:53:55 +0000
232@@ -6,7 +6,6 @@
233 constraints: mem=1G
234 options:
235 network-manager: Quantum
236- quantum-security-groups: "yes"
237 region: cell11
238 verbose: True
239 debug: True
240
241=== modified file 'bundles/cells/cells-cell2.yaml'
242--- bundles/cells/cells-cell2.yaml 2014-10-24 10:48:06 +0000
243+++ bundles/cells/cells-cell2.yaml 2016-04-21 10:53:55 +0000
244@@ -6,7 +6,6 @@
245 constraints: mem=1G
246 options:
247 network-manager: Quantum
248- quantum-security-groups: "yes"
249 region: cell2
250 verbose: True
251 debug: True
252
253=== modified file 'bundles/dev/11-default.yaml'
254--- bundles/dev/11-default.yaml 2016-03-11 09:33:21 +0000
255+++ bundles/dev/11-default.yaml 2016-04-21 10:53:55 +0000
256@@ -36,7 +36,7 @@
257 services:
258 # Co-located
259 neutron-gateway:
260- branch: https://github.com/openstack/charm-neutron-gateway;stable
261+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
262 constraints: "tags=gateway arch=amd64"
263 options:
264 ext-port: eth1
265@@ -45,7 +45,7 @@
266 - "0"
267 # Machines
268 ceph:
269- branch: https://github.com/openstack/charm-ceph;stable
270+ branch: https://github.com/openstack/charm-ceph;stable/16.04
271 num_units: 3
272 constraints: "tags=storage,^object_storage arch=amd64"
273 options:
274@@ -54,28 +54,28 @@
275 osd-devices: /dev/vdb /dev/sdb
276 osd-reformat: "yes"
277 swift-storage-z1:
278- branch: https://github.com/openstack/charm-swift-storage;stable
279+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
280 constraints: "tags=object_zone_1 arch=amd64"
281 options:
282 zone: 1
283 block-device: /dev/vdb /dev/sdb
284 overwrite: "true"
285 swift-storage-z2:
286- branch: https://github.com/openstack/charm-swift-storage;stable
287+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
288 constraints: "tags=object_zone_2 arch=amd64"
289 options:
290 zone: 2
291 block-device: /dev/vdb /dev/sdb
292 overwrite: "true"
293 swift-storage-z3:
294- branch: https://github.com/openstack/charm-swift-storage;stable
295+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
296 constraints: "tags=object_zone_3 arch=amd64"
297 options:
298 zone: 3
299 block-device: /dev/vdb /dev/sdb
300 overwrite: "true"
301 nova-compute:
302- branch: https://github.com/openstack/charm-nova-compute;stable
303+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
304 num_units: 3
305 constraints: "tags=compute arch=amd64"
306 options:
307@@ -83,7 +83,7 @@
308 enable-resize: True
309 migration-auth-type: ssh
310 mysql:
311- branch: https://github.com/openstack/charm-percona-cluster;stable
312+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
313 constraints: "tags=database arch=amd64"
314 options:
315 dataset-size: 50%
316@@ -94,7 +94,7 @@
317 to:
318 - "lxc:0"
319 swift-proxy:
320- branch: https://github.com/openstack/charm-swift-proxy;stable
321+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
322 options:
323 zone-assignment: manual
324 replicas: 3
325@@ -102,50 +102,49 @@
326 to:
327 - "lxc:0"
328 heat:
329- branch: https://github.com/openstack/charm-heat;stable
330+ branch: https://github.com/openstack/charm-heat;stable/16.04
331 to:
332 - "lxc:ceph=0"
333 ceilometer:
334- branch: https://github.com/openstack/charm-ceilometer;stable
335+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
336 to:
337 - "lxc:ceph=0"
338 openstack-dashboard:
339- branch: https://github.com/openstack/charm-openstack-dashboard;stable
340+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
341 to:
342 - "lxc:ceph=1"
343 neutron-api:
344- branch: https://github.com/openstack/charm-neutron-api;stable
345+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
346 options:
347 neutron-security-groups: True
348 to:
349 - "lxc:ceph=1"
350 glance:
351- branch: https://github.com/openstack/charm-glance;stable
352+ branch: https://github.com/openstack/charm-glance;stable/16.04
353 to:
354 - "lxc:ceph=2"
355 cinder:
356- branch: https://github.com/openstack/charm-cinder;stable
357+ branch: https://github.com/openstack/charm-cinder;stable/16.04
358 options:
359 block-device: "None"
360 glance-api-version: 2
361 to:
362 - "lxc:ceph=2"
363 keystone:
364- branch: https://github.com/openstack/charm-keystone;stable
365+ branch: https://github.com/openstack/charm-keystone;stable/16.04
366 options:
367 admin-password: openstack
368 admin-token: ubuntutesting
369 to:
370 - "lxc:swift-storage-z1=0"
371 nova-cloud-controller:
372- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
373+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
374 options:
375 network-manager: Neutron
376- quantum-security-groups: "yes"
377 to:
378 - "lxc:swift-storage-z2=0"
379 rabbitmq-server:
380- branch: https://github.com/openstack/charm-rabbitmq-server;stable
381+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
382 to:
383 - "lxc:swift-storage-z3=0"
384 mongodb:
385@@ -154,11 +153,11 @@
386 - "lxc:mysql"
387 # Subordinates
388 cinder-ceph:
389- branch: https://github.com/openstack/charm-cinder-ceph;stable
390+ branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
391 ceilometer-agent:
392- branch: https://github.com/openstack/charm-ceilometer-agent;stable
393+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
394 neutron-openvswitch:
395- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
396+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
397 ntp:
398 branch: lp:charms/trusty/ntp
399 num_units: 0
400
401=== modified file 'bundles/dev/hacluster-keystone-default.yaml'
402--- bundles/dev/hacluster-keystone-default.yaml 2016-03-11 09:33:21 +0000
403+++ bundles/dev/hacluster-keystone-default.yaml 2016-04-21 10:53:55 +0000
404@@ -28,7 +28,7 @@
405 debug: 'true'
406 netmtu: 1300
407 keystone:
408- branch: https://github.com/openstack/charm-keystone;stable
409+ branch: https://github.com/openstack/charm-keystone;stable/16.04
410 num_units: 3
411 admin-password: 'openstack'
412 admin-token: 'ubuntutesting'
413
414=== modified file 'bundles/dev/icehouse.yaml'
415--- bundles/dev/icehouse.yaml 2016-03-08 09:44:01 +0000
416+++ bundles/dev/icehouse.yaml 2016-04-21 10:53:55 +0000
417@@ -44,7 +44,6 @@
418 constraints: mem=1G
419 options:
420 network-manager: Quantum
421- quantum-security-groups: "yes"
422 neutron-gateway:
423 branch: lp:charms/neutron-gateway
424 constraints: mem=1G
425
426=== modified file 'bundles/dev/neutron-breakout.yaml'
427--- bundles/dev/neutron-breakout.yaml 2016-03-08 09:44:01 +0000
428+++ bundles/dev/neutron-breakout.yaml 2016-04-21 10:53:55 +0000
429@@ -44,7 +44,6 @@
430 constraints: mem=1G
431 options:
432 network-manager: Quantum
433- quantum-security-groups: "yes"
434 neutron-api:
435 branch: lp:~gnuoy/charms/trusty/neutron-api/neutron-refactor
436 constraints: mem=1G
437
438=== modified file 'bundles/dev/ssl-everywhere.yaml'
439--- bundles/dev/ssl-everywhere.yaml 2016-03-08 09:44:01 +0000
440+++ bundles/dev/ssl-everywhere.yaml 2016-04-21 10:53:55 +0000
441@@ -50,7 +50,6 @@
442 constraints: mem=1G
443 options:
444 network-manager: Quantum
445- quantum-security-groups: "yes"
446 neutron-gateway:
447 branch: lp:~openstack-charmers/charms/precise/neutron-gateway/ssl-everywhere
448 constraints: mem=1G
449
450=== modified file 'bundles/keystone-v3/next.yaml'
451--- bundles/keystone-v3/next.yaml 2016-04-11 16:58:20 +0000
452+++ bundles/keystone-v3/next.yaml 2016-04-21 10:53:55 +0000
453@@ -174,7 +174,7 @@
454 neutron-openvswitch:
455 branch: https://github.com/openstack/charm-neutron-openvswitch
456 rabbitmq-server-neutron:
457- branch: https://github.com/openstack/charm-rabbitmq-server;stable
458+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
459 constraints: mem=1G
460 relations:
461 - [ neutron-api, mysql ]
462
463=== modified file 'bundles/leadership-election/leadership-election.yaml'
464--- bundles/leadership-election/leadership-election.yaml 2016-03-11 09:33:21 +0000
465+++ bundles/leadership-election/leadership-election.yaml 2016-04-21 10:53:55 +0000
466@@ -49,7 +49,6 @@
467 constraints: mem=1G
468 options:
469 network-manager: Neutron
470- quantum-security-groups: "yes"
471 vip: 10.5.100.4
472 neutron-gateway:
473 branch: https://github.com/openstack/charm-neutron-gateway
474@@ -183,7 +182,7 @@
475 neutron-openvswitch:
476 branch: https://github.com/openstack/charm-neutron-openvswitch
477 rabbitmq-server-neutron:
478- branch: https://github.com/openstack/charm-rabbitmq-server;stable
479+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
480 constraints: mem=1G
481 relations:
482 - [ neutron-api, mysql ]
483
484=== modified file 'bundles/lxd/default.yaml'
485--- bundles/lxd/default.yaml 2016-03-29 17:34:54 +0000
486+++ bundles/lxd/default.yaml 2016-04-21 10:53:55 +0000
487@@ -11,19 +11,19 @@
488 dataset-size: 50%
489 max-connections: 20000
490 rabbitmq-server:
491- branch: https://github.com/openstack/charm-rabbitmq-server;stable
492+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
493 constraints: mem=1G
494 keystone:
495- branch: https://github.com/openstack/charm-keystone;stable
496+ branch: https://github.com/openstack/charm-keystone;stable/16.04
497 constraints: mem=1G
498 options:
499 admin-password: openstack
500 admin-token: ubuntutesting
501 openstack-dashboard:
502- branch: https://github.com/openstack/charm-openstack-dashboard;stable
503+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
504 constraints: mem=1G
505 nova-compute:
506- branch: https://github.com/openstack/charm-nova-compute;stable
507+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
508 num_units: 3
509 constraints: mem=4G
510 options:
511@@ -32,62 +32,61 @@
512 migration-auth-type: ssh
513 virt-type: lxd
514 nova-cloud-controller:
515- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
516+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
517 constraints: mem=1G
518 options:
519 network-manager: Neutron
520- quantum-security-groups: "yes"
521 ram-allocation-ratio: 5.0
522 neutron-gateway:
523- branch: https://github.com/openstack/charm-neutron-gateway;stable
524+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
525 constraints: mem=1G
526 options:
527 instance-mtu: 1300
528 glance:
529- branch: https://github.com/openstack/charm-glance;stable
530+ branch: https://github.com/openstack/charm-glance;stable/16.04
531 constraints: mem=1G
532 swift-proxy:
533- branch: https://github.com/openstack/charm-swift-proxy;stable
534+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
535 constraints: mem=1G
536 options:
537 zone-assignment: manual
538 replicas: 3
539 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
540 swift-storage-z1:
541- branch: https://github.com/openstack/charm-swift-storage;stable
542+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
543 constraints: mem=1G
544 options:
545 zone: 1
546 block-device: vdb
547 overwrite: "true"
548 swift-storage-z2:
549- branch: https://github.com/openstack/charm-swift-storage;stable
550+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
551 constraints: mem=1G
552 options:
553 zone: 2
554 block-device: vdb
555 overwrite: "true"
556 swift-storage-z3:
557- branch: https://github.com/openstack/charm-swift-storage;stable
558+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
559 constraints: mem=1G
560 options:
561 zone: 3
562 block-device: vdb
563 overwrite: "true"
564 ceilometer:
565- branch: https://github.com/openstack/charm-ceilometer;stable
566+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
567 constraints: mem=1G
568 ceilometer-agent:
569- branch: https://github.com/openstack/charm-ceilometer-agent;stable
570+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
571 heat:
572- branch: https://github.com/openstack/charm-heat;stable
573+ branch: https://github.com/openstack/charm-heat;stable/16.04
574 mongodb:
575 branch: lp:charms/trusty/mongodb
576 constraints: mem=1G
577 lxd:
578 branch: https://github.com/openstack/charm-lxd
579 options:
580- block-device: /dev/vdb
581+ block-devices: /dev/vdb
582 ephemeral-unmount: /mnt
583 storage-type: lvm
584 overwrite: "true"
585@@ -130,12 +129,12 @@
586 inherits: openstack-singlerabbit
587 services:
588 neutron-api:
589- branch: https://github.com/openstack/charm-neutron-api;stable
590+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
591 constraints: mem=1G
592 options:
593 neutron-security-groups: True
594 neutron-openvswitch:
595- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
596+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
597 relations:
598 - [ neutron-api, mysql ]
599 - [ neutron-api, rabbitmq-server ]
600@@ -161,3 +160,12 @@
601 overrides:
602 source: proposed
603 openstack-origin: distro-proposed
604+# Mitaka
605+xenial-mitaka:
606+ inherits: openstack-icehouse
607+ series: xenial
608+xenial-mitaka-proposed:
609+ inherits: xenial-mitaka
610+ overrides:
611+ source: proposed
612+ openstack-origin: distro-proposed
613
614=== modified file 'bundles/lxd/source/default.yaml'
615--- bundles/lxd/source/default.yaml 2016-04-05 15:39:21 +0000
616+++ bundles/lxd/source/default.yaml 2016-04-21 10:53:55 +0000
617@@ -11,19 +11,19 @@
618 dataset-size: 50%
619 max-connections: 20000
620 rabbitmq-server:
621- branch: https://github.com/openstack/charm-rabbitmq-server;stable
622+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
623 constraints: mem=1G
624 keystone:
625- branch: https://github.com/openstack/charm-keystone;stable
626+ branch: https://github.com/openstack/charm-keystone;stable/16.04
627 constraints: mem=1G
628 options:
629 admin-password: openstack
630 admin-token: ubuntutesting
631 openstack-dashboard:
632- branch: https://github.com/openstack/charm-openstack-dashboard;stable
633+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
634 constraints: mem=1G
635 nova-compute:
636- branch: https://github.com/openstack/charm-nova-compute;stable
637+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
638 num_units: 3
639 constraints: mem=4G
640 options:
641@@ -32,57 +32,56 @@
642 migration-auth-type: ssh
643 virt-type: lxd
644 nova-cloud-controller:
645- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
646+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
647 constraints: mem=1G
648 options:
649 network-manager: Neutron
650- quantum-security-groups: "yes"
651 ram-allocation-ratio: 5.0
652 neutron-gateway:
653- branch: https://github.com/openstack/charm-neutron-gateway;stable
654+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
655 constraints: mem=1G
656 options:
657 instance-mtu: 1300
658 glance:
659- branch: https://github.com/openstack/charm-glance;stable
660+ branch: https://github.com/openstack/charm-glance;stable/16.04
661 constraints: mem=1G
662 swift-proxy:
663- branch: https://github.com/openstack/charm-swift-proxy;stable
664+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
665 constraints: mem=1G
666 options:
667 zone-assignment: manual
668 replicas: 3
669 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
670 swift-storage-z1:
671- branch: https://github.com/openstack/charm-swift-storage;stable
672+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
673 constraints: mem=1G
674 options:
675 zone: 1
676 block-device: vdb
677 overwrite: "true"
678 swift-storage-z2:
679- branch: https://github.com/openstack/charm-swift-storage;stable
680+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
681 constraints: mem=1G
682 options:
683 zone: 2
684 block-device: vdb
685 overwrite: "true"
686 swift-storage-z3:
687- branch: https://github.com/openstack/charm-swift-storage;stable
688+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
689 constraints: mem=1G
690 options:
691 zone: 3
692 block-device: vdb
693 overwrite: "true"
694 ceilometer:
695- branch: https://github.com/openstack/charm-ceilometer;stable
696+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
697 constraints: mem=1G
698 ceilometer-agent:
699- branch: https://github.com/openstack/charm-ceilometer-agent;stable
700+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
701 heat:
702- branch: https://github.com/openstack/charm-heat;stable
703+ branch: https://github.com/openstack/charm-heat;stable/16.04
704 mongodb:
705- branch: lp:charms/trusty/mongodb;stable
706+ branch: lp:charms/trusty/mongodb;stable/16.04
707 constraints: mem=1G
708 lxd:
709 branch: https://github.com/openstack/charm-lxd
710@@ -130,12 +129,12 @@
711 inherits: openstack-singlerabbit
712 services:
713 neutron-api:
714- branch: https://github.com/openstack/charm-neutron-api;stable
715+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
716 constraints: mem=1G
717 options:
718 neutron-security-groups: True
719 neutron-openvswitch:
720- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
721+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
722 relations:
723 - [ neutron-api, mysql ]
724 - [ neutron-api, rabbitmq-server ]
725
726=== modified file 'bundles/multi-hypervisor/default.yaml'
727--- bundles/multi-hypervisor/default.yaml 2016-03-23 20:10:04 +0000
728+++ bundles/multi-hypervisor/default.yaml 2016-04-21 10:53:55 +0000
729@@ -4,16 +4,16 @@
730 openstack-services:
731 services:
732 mysql:
733- branch: https://github.com/openstack/charm-percona-cluster;stable
734+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
735 constraints: mem=1G
736 options:
737 dataset-size: 50%
738 max-connections: 20000
739 rabbitmq-server:
740- branch: https://github.com/openstack/charm-rabbitmq-server;stable
741+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
742 constraints: mem=1G
743 ceph:
744- branch: https://github.com/openstack/charm-ceph;stable
745+ branch: https://github.com/openstack/charm-ceph;stable/16.04
746 num_units: 3
747 constraints: mem=1G
748 options:
749@@ -24,16 +24,16 @@
750 osd-reformat: "yes"
751 ephemeral-unmount: /mnt
752 keystone:
753- branch: https://github.com/openstack/charm-keystone;stable
754+ branch: https://github.com/openstack/charm-keystone;stable/16.04
755 constraints: mem=1G
756 options:
757 admin-password: openstack
758 admin-token: ubuntutesting
759 openstack-dashboard:
760- branch: https://github.com/openstack/charm-openstack-dashboard;stable
761+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
762 constraints: mem=1G
763 nova-compute-kvm:
764- branch: https://github.com/openstack/charm-nova-compute;stable
765+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
766 num_units: 3
767 constraints: mem=4G
768 options:
769@@ -41,7 +41,7 @@
770 enable-resize: True
771 migration-auth-type: ssh
772 nova-compute-lxd:
773- branch: https://github.com/openstack/charm-nova-compute;stable
774+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
775 num_units: 3
776 constraints: mem=4G
777 options:
778@@ -54,72 +54,71 @@
779 storage-type: lvm
780 overwrite: "true"
781 nova-cloud-controller:
782- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
783+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
784 constraints: mem=1G
785 options:
786 network-manager: Neutron
787- quantum-security-groups: "yes"
788 neutron-gateway:
789- branch: https://github.com/openstack/charm-neutron-gateway;stable
790+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
791 constraints: mem=1G
792 options:
793 instance-mtu: 1300
794 cinder:
795- branch: https://github.com/openstack/charm-cinder;stable
796+ branch: https://github.com/openstack/charm-cinder;stable/16.04
797 options:
798 block-device: "None"
799 glance-api-version: 2
800 constraints: mem=1G
801 cinder-ceph:
802- branch: https://github.com/openstack/charm-cinder-ceph;stable
803+ branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
804 glance:
805- branch: https://github.com/openstack/charm-glance;stable
806+ branch: https://github.com/openstack/charm-glance;stable/16.04
807 constraints: mem=1G
808 swift-proxy:
809- branch: https://github.com/openstack/charm-swift-proxy;stable
810+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
811 constraints: mem=1G
812 options:
813 zone-assignment: manual
814 replicas: 3
815 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
816 swift-storage-z1:
817- branch: https://github.com/openstack/charm-swift-storage;stable
818+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
819 constraints: mem=1G
820 options:
821 zone: 1
822 block-device: vdb
823 overwrite: "true"
824 swift-storage-z2:
825- branch: https://github.com/openstack/charm-swift-storage;stable
826+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
827 constraints: mem=1G
828 options:
829 zone: 2
830 block-device: vdb
831 overwrite: "true"
832 swift-storage-z3:
833- branch: https://github.com/openstack/charm-swift-storage;stable
834+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
835 constraints: mem=1G
836 options:
837 zone: 3
838 block-device: vdb
839 overwrite: "true"
840 ceilometer:
841- branch: https://github.com/openstack/charm-ceilometer;stable
842+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
843 constraints: mem=1G
844 ceilometer-agent:
845- branch: https://github.com/openstack/charm-ceilometer-agent;stable
846+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
847 heat:
848- branch: https://github.com/openstack/charm-heat;stable
849+ branch: https://github.com/openstack/charm-heat;stable/16.04
850 mongodb:
851 branch: lp:charms/trusty/mongodb
852 constraints: mem=1G
853 neutron-api:
854- branch: https://github.com/openstack/charm-neutron-api;stable
855+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
856 constraints: mem=1G
857 options:
858 neutron-security-groups: True
859 neutron-openvswitch:
860- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
861+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
862 relations:
863 - [ keystone, mysql ]
864 - [ nova-cloud-controller, mysql ]
865
866=== modified file 'bundles/nsx/nsx.yaml'
867--- bundles/nsx/nsx.yaml 2016-03-11 09:33:21 +0000
868+++ bundles/nsx/nsx.yaml 2016-04-21 10:53:55 +0000
869@@ -7,10 +7,10 @@
870 options:
871 dataset-size: 50%
872 rabbitmq-server:
873- branch: https://github.com/openstack/charm-rabbitmq-server;stable
874+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
875 constraints: mem=1G
876 ceph:
877- branch: https://github.com/openstack/charm-ceph;stable
878+ branch: https://github.com/openstack/charm-ceph;stable/16.04
879 constraints: mem=1G
880 num_units: 3
881 options:
882@@ -21,41 +21,40 @@
883 osd-reformat: "yes"
884 ephemeral-unmount: /mnt
885 keystone:
886- branch: https://github.com/openstack/charm-keystone;stable
887+ branch: https://github.com/openstack/charm-keystone;stable/16.04
888 constraints: mem=1G
889 options:
890 admin-password: openstack
891 admin-token: ubuntutesting
892 openstack-dashboard:
893- branch: https://github.com/openstack/charm-openstack-dashboard;stable
894+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
895 constraints: mem=1G
896 nova-compute:
897- branch: https://github.com/openstack/charm-nova-compute;stable
898+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
899 num_units: 3
900 constraints: mem=4G
901 options:
902 enable-live-migration: True
903 enable-resize: True
904 nova-cloud-controller:
905- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
906+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
907 constraints: mem=4G
908 options:
909 network-manager: Neutron
910 quantum-plugin: nsx
911- quantum-security-groups: "yes"
912 cinder:
913- branch: https://github.com/openstack/charm-cinder;stable
914+ branch: https://github.com/openstack/charm-cinder;stable/16.04
915 constraints: mem=1G
916 options:
917 block-device: "None"
918 glance-api-version: 2
919 cinder-ceph:
920- branch: https://github.com/openstack/charm-cinder-ceph;stable
921+ branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
922 glance:
923 constraints: mem=1G
924- branch: https://github.com/openstack/charm-glance;stable
925+ branch: https://github.com/openstack/charm-glance;stable/16.04
926 neutron-api:
927- branch: https://github.com/openstack/charm-neutron-api;stable
928+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
929 constraints: mem=1G
930 options:
931 neutron-plugin: nsx
932@@ -65,7 +64,7 @@
933 nsx-tz-uuid: 18aeea23-77f5-46f5-8e63-42d2998d9245
934 nsx-l3-uuid: f5c3aa06-8bf3-4344-ab5d-9f8d1c718245
935 neutron-gateway:
936- branch: https://github.com/openstack/charm-neutron-gateway;stable
937+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
938 constraints: mem=1G
939 options:
940 plugin: nsx
941
942=== modified file 'bundles/ovs-odl/ovs-odl.yaml'
943--- bundles/ovs-odl/ovs-odl.yaml 2016-04-11 16:58:20 +0000
944+++ bundles/ovs-odl/ovs-odl.yaml 2016-04-21 10:53:55 +0000
945@@ -36,7 +36,7 @@
946 options:
947 dataset-size: 50%
948 rabbitmq-server:
949- branch: https://github.com/openstack/charm-rabbitmq-server;stable
950+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
951 keystone:
952 branch: https://github.com/openstack/charm-keystone
953 options:
954
955=== modified file 'bundles/ppc64/deprecated/ppc64el-two-unit-method1.yaml'
956--- bundles/ppc64/deprecated/ppc64el-two-unit-method1.yaml 2016-04-04 17:29:50 +0000
957+++ bundles/ppc64/deprecated/ppc64el-two-unit-method1.yaml 2016-04-21 10:53:55 +0000
958@@ -95,7 +95,6 @@
959 num_units: 1
960 options:
961 "network-manager": Neutron
962- "quantum-security-groups": "yes"
963 annotations:
964 "gui-x": "0"
965 "gui-y": "500"
966
967=== modified file 'bundles/ppc64/deprecated/ppc64el-two-unit-method2.yaml'
968--- bundles/ppc64/deprecated/ppc64el-two-unit-method2.yaml 2016-04-04 17:29:50 +0000
969+++ bundles/ppc64/deprecated/ppc64el-two-unit-method2.yaml 2016-04-21 10:53:55 +0000
970@@ -99,7 +99,6 @@
971 num_units: 1
972 options:
973 "network-manager": Neutron
974- "quantum-security-groups": "yes"
975 annotations:
976 "gui-x": "0"
977 "gui-y": "500"
978
979=== modified file 'bundles/ppc64/powerkvm-fullstack.yaml'
980--- bundles/ppc64/powerkvm-fullstack.yaml 2016-04-11 16:53:04 +0000
981+++ bundles/ppc64/powerkvm-fullstack.yaml 2016-04-21 10:53:55 +0000
982@@ -55,25 +55,25 @@
983 openstack-services:
984 services:
985 mysql:
986- branch: https://github.com/openstack/charm-percona-cluster;stable
987+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
988 options:
989 dataset-size: 75%
990 max-connections: 20000
991 to:
992 - "lxc:0"
993 rabbitmq-server:
994- branch: https://github.com/openstack/charm-rabbitmq-server;stable
995+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
996 to:
997 - "lxc:0"
998 keystone:
999- branch: https://github.com/openstack/charm-keystone;stable
1000+ branch: https://github.com/openstack/charm-keystone;stable/16.04
1001 options:
1002 admin-password: openstack
1003 admin-token: ubuntutesting
1004 to:
1005 - "lxc:0"
1006 openstack-dashboard:
1007- branch: https://github.com/openstack/charm-openstack-dashboard;stable
1008+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
1009 constraints: mem=1G
1010 to:
1011 - "lxc:0"
1012@@ -87,13 +87,13 @@
1013 to:
1014 - "lxc:0"
1015 nova-cloud-controller:
1016- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
1017+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
1018 options:
1019 network-manager: Neutron
1020 to:
1021 - "lxc:0"
1022 neutron-gateway:
1023- branch: https://github.com/openstack/charm-neutron-gateway;stable
1024+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
1025 constraints: arch=amd64
1026 options:
1027 instance-mtu: 1300
1028@@ -101,11 +101,11 @@
1029 to:
1030 - "0"
1031 glance:
1032- branch: https://github.com/openstack/charm-glance;stable
1033+ branch: https://github.com/openstack/charm-glance;stable/16.04
1034 to:
1035 - "lxc:0"
1036 ceph:
1037- branch: https://github.com/openstack/charm-ceph;stable
1038+ branch: https://github.com/openstack/charm-ceph;stable/16.04
1039 num_units: 3
1040 constraints: mem=1G arch=amd64
1041 options:
1042@@ -116,7 +116,7 @@
1043 osd-reformat: "yes"
1044 ephemeral-unmount: /mnt
1045 swift-proxy:
1046- branch: https://github.com/openstack/charm-swift-proxy;stable
1047+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
1048 constraints: mem=1G arch=amd64
1049 options:
1050 zone-assignment: manual
1051@@ -125,21 +125,21 @@
1052 to:
1053 - "lxc:0"
1054 swift-storage-z1:
1055- branch: https://github.com/openstack/charm-swift-storage;stable
1056+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1057 constraints: mem=1G arch=amd64
1058 options:
1059 zone: 1
1060 block-device: /dev/sdb /dev/vdb
1061 overwrite: "true"
1062 swift-storage-z2:
1063- branch: https://github.com/openstack/charm-swift-storage;stable
1064+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1065 constraints: mem=1G arch=amd64
1066 options:
1067 zone: 2
1068 block-device: /dev/sdb /dev/vdb
1069 overwrite: "true"
1070 swift-storage-z3:
1071- branch: https://github.com/openstack/charm-swift-storage;stable
1072+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1073 constraints: mem=1G arch=amd64
1074 options:
1075 zone: 3
1076@@ -172,7 +172,7 @@
1077 inherits: openstack-singlerabbit
1078 services:
1079 neutron-api:
1080- branch: https://github.com/openstack/charm-neutron-api;stable
1081+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1082 constraints: mem=1G
1083 options:
1084 neutron-security-groups: True
1085@@ -189,14 +189,14 @@
1086 inherits: openstack-services
1087 services:
1088 neutron-api:
1089- branch: https://github.com/openstack/charm-neutron-api;stable
1090+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1091 constraints: mem=1G
1092 options:
1093 neutron-security-groups: True
1094 neutron-openvswitch:
1095- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1096+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1097 rabbitmq-server-neutron:
1098- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1099+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1100 constraints: mem=1G
1101 relations:
1102 - [ neutron-api, mysql ]
1103
1104=== modified file 'bundles/ppc64/powerkvm-two-unit-dense.yaml'
1105--- bundles/ppc64/powerkvm-two-unit-dense.yaml 2016-04-18 14:19:17 +0000
1106+++ bundles/ppc64/powerkvm-two-unit-dense.yaml 2016-04-21 10:53:55 +0000
1107@@ -6,24 +6,24 @@
1108 openstack-services:
1109 services:
1110 mysql:
1111- branch: https://github.com/openstack/charm-percona-cluster;stable
1112+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
1113 options:
1114 dataset-size: 75%
1115 to:
1116 - "lxc:0"
1117 rabbitmq-server:
1118- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1119+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1120 to:
1121 - "lxc:0"
1122 keystone:
1123- branch: https://github.com/openstack/charm-keystone;stable
1124+ branch: https://github.com/openstack/charm-keystone;stable/16.04
1125 options:
1126 admin-password: openstack
1127 admin-token: ubuntutesting
1128 to:
1129 - "lxc:0"
1130 openstack-dashboard:
1131- branch: https://github.com/openstack/charm-openstack-dashboard;stable
1132+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
1133 constraints: mem=1G
1134 to:
1135 - "lxc:0"
1136@@ -37,7 +37,7 @@
1137 to:
1138 - "lxc:0"
1139 nova-cloud-controller:
1140- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
1141+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
1142 options:
1143 network-manager: Neutron
1144 to:
1145@@ -49,7 +49,7 @@
1146 instance-mtu: 1300
1147 ext-port: "eth1"
1148 glance:
1149- branch: https://github.com/openstack/charm-glance;stable
1150+ branch: https://github.com/openstack/charm-glance;stable/16.04
1151 to:
1152 - "lxc:0"
1153 relations:
1154@@ -74,7 +74,7 @@
1155 inherits: openstack-singlerabbit
1156 services:
1157 neutron-api:
1158- branch: https://github.com/openstack/charm-neutron-api;stable
1159+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1160 constraints: mem=1G
1161 options:
1162 neutron-security-groups: True
1163@@ -91,14 +91,14 @@
1164 inherits: openstack-services
1165 services:
1166 neutron-api:
1167- branch: https://github.com/openstack/charm-neutron-api;stable
1168+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1169 constraints: mem=1G
1170 options:
1171 neutron-security-groups: True
1172 neutron-openvswitch:
1173- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1174+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1175 rabbitmq-server-neutron:
1176- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1177+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1178 constraints: mem=1G
1179 relations:
1180 - [ neutron-api, mysql ]
1181
1182=== modified file 'bundles/source/default.yaml'
1183--- bundles/source/default.yaml 2016-03-11 09:33:21 +0000
1184+++ bundles/source/default.yaml 2016-04-21 10:53:55 +0000
1185@@ -4,7 +4,7 @@
1186 openstack-services:
1187 services:
1188 mysql:
1189- branch: https://github.com/openstack/charm-percona-cluster;stable
1190+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
1191 constraints: mem=4G
1192 options:
1193 dataset-size: 50%
1194@@ -12,10 +12,10 @@
1195 # root-password: changeme
1196 # sst-password: changeme
1197 rabbitmq-server:
1198- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1199+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1200 constraints: mem=1G
1201 ceph:
1202- branch: https://github.com/openstack/charm-ceph;stable
1203+ branch: https://github.com/openstack/charm-ceph;stable/16.04
1204 num_units: 3
1205 constraints: mem=1G
1206 options:
1207@@ -26,16 +26,16 @@
1208 osd-reformat: "yes"
1209 ephemeral-unmount: /mnt
1210 keystone:
1211- branch: https://github.com/openstack/charm-keystone;stable
1212+ branch: https://github.com/openstack/charm-keystone;stable/16.04
1213 constraints: mem=1G
1214 options:
1215 admin-password: openstack
1216 admin-token: ubuntutesting
1217 openstack-dashboard:
1218- branch: https://github.com/openstack/charm-openstack-dashboard;stable
1219+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
1220 constraints: mem=1G
1221 nova-compute:
1222- branch: https://github.com/openstack/charm-nova-compute;stable
1223+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
1224 num_units: 3
1225 constraints: mem=4G
1226 options:
1227@@ -43,62 +43,61 @@
1228 enable-resize: True
1229 migration-auth-type: ssh
1230 nova-cloud-controller:
1231- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
1232+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
1233 constraints: mem=1G
1234 options:
1235 network-manager: Neutron
1236- quantum-security-groups: "yes"
1237 neutron-gateway:
1238- branch: https://github.com/openstack/charm-neutron-gateway;stable
1239+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
1240 constraints: mem=1G
1241 options:
1242 instance-mtu: 1300
1243 cinder:
1244- branch: https://github.com/openstack/charm-cinder;stable
1245+ branch: https://github.com/openstack/charm-cinder;stable/16.04
1246 options:
1247 block-device: "None"
1248 glance-api-version: 2
1249 constraints: mem=1G
1250 # cinder-ceph:
1251-# branch: https://github.com/openstack/charm-cinder-ceph;stable
1252+# branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
1253 glance:
1254- branch: https://github.com/openstack/charm-glance;stable
1255+ branch: https://github.com/openstack/charm-glance;stable/16.04
1256 constraints: mem=1G
1257 swift-proxy:
1258- branch: https://github.com/openstack/charm-swift-proxy;stable
1259+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
1260 constraints: mem=1G
1261 options:
1262 zone-assignment: manual
1263 replicas: 3
1264 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
1265 swift-storage-z1:
1266- branch: https://github.com/openstack/charm-swift-storage;stable
1267+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1268 constraints: mem=1G
1269 options:
1270 zone: 1
1271 block-device: vdb
1272 overwrite: "true"
1273 swift-storage-z2:
1274- branch: https://github.com/openstack/charm-swift-storage;stable
1275+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1276 constraints: mem=1G
1277 options:
1278 zone: 2
1279 block-device: vdb
1280 overwrite: "true"
1281 swift-storage-z3:
1282- branch: https://github.com/openstack/charm-swift-storage;stable
1283+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1284 constraints: mem=1G
1285 options:
1286 zone: 3
1287 block-device: vdb
1288 overwrite: "true"
1289 ceilometer:
1290- branch: https://github.com/openstack/charm-ceilometer;stable
1291+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
1292 constraints: mem=1G
1293 ceilometer-agent:
1294- branch: https://github.com/openstack/charm-ceilometer-agent;stable
1295+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
1296 heat:
1297- branch: https://github.com/openstack/charm-heat;stable
1298+ branch: https://github.com/openstack/charm-heat;stable/16.04
1299 mongodb:
1300 branch: lp:charms/trusty/mongodb
1301 constraints: mem=1G
1302@@ -149,12 +148,12 @@
1303 inherits: openstack-singlerabbit
1304 services:
1305 neutron-api:
1306- branch: https://github.com/openstack/charm-neutron-api;stable
1307+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1308 constraints: mem=1G
1309 options:
1310 neutron-security-groups: True
1311 neutron-openvswitch:
1312- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1313+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1314 relations:
1315 - [ neutron-api, mysql ]
1316 - [ neutron-api, rabbitmq-server ]
1317@@ -168,14 +167,14 @@
1318 inherits: openstack-services
1319 services:
1320 neutron-api:
1321- branch: https://github.com/openstack/charm-neutron-api;stable
1322+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1323 constraints: mem=1G
1324 options:
1325 neutron-security-groups: True
1326 neutron-openvswitch:
1327- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1328+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1329 rabbitmq-server-neutron:
1330- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1331+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1332 constraints: mem=1G
1333 relations:
1334 - [ neutron-api, mysql ]
1335
1336=== modified file 'bundles/source/next.yaml'
1337--- bundles/source/next.yaml 2016-04-11 16:58:20 +0000
1338+++ bundles/source/next.yaml 2016-04-21 10:53:55 +0000
1339@@ -174,7 +174,7 @@
1340 neutron-openvswitch:
1341 branch: https://github.com/openstack/charm-neutron-openvswitch
1342 rabbitmq-server-neutron:
1343- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1344+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1345 constraints: mem=1G
1346 relations:
1347 - [ neutron-api, mysql ]
1348
1349=== modified file 'bundles/sparse/default.yaml'
1350--- bundles/sparse/default.yaml 2016-03-11 09:33:21 +0000
1351+++ bundles/sparse/default.yaml 2016-04-21 10:53:55 +0000
1352@@ -4,16 +4,16 @@
1353 openstack-services:
1354 services:
1355 mysql:
1356- branch: https://github.com/openstack/charm-percona-cluster;stable
1357+ branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
1358 constraints: mem=1G
1359 options:
1360 dataset-size: 50%
1361 max-connections: 20000
1362 rabbitmq-server:
1363- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1364+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1365 constraints: mem=1G
1366 ceph:
1367- branch: https://github.com/openstack/charm-ceph;stable
1368+ branch: https://github.com/openstack/charm-ceph;stable/16.04
1369 num_units: 3
1370 constraints: mem=1G
1371 options:
1372@@ -24,16 +24,16 @@
1373 osd-reformat: "yes"
1374 ephemeral-unmount: /mnt
1375 keystone:
1376- branch: https://github.com/openstack/charm-keystone;stable
1377+ branch: https://github.com/openstack/charm-keystone;stable/16.04
1378 constraints: mem=1G
1379 options:
1380 admin-password: openstack
1381 admin-token: ubuntutesting
1382 openstack-dashboard:
1383- branch: https://github.com/openstack/charm-openstack-dashboard;stable
1384+ branch: https://github.com/openstack/charm-openstack-dashboard;stable/16.04
1385 constraints: mem=1G
1386 nova-compute:
1387- branch: https://github.com/openstack/charm-nova-compute;stable
1388+ branch: https://github.com/openstack/charm-nova-compute;stable/16.04
1389 num_units: 3
1390 constraints: mem=4G
1391 options:
1392@@ -41,62 +41,61 @@
1393 enable-resize: True
1394 migration-auth-type: ssh
1395 nova-cloud-controller:
1396- branch: https://github.com/openstack/charm-nova-cloud-controller;stable
1397+ branch: https://github.com/openstack/charm-nova-cloud-controller;stable/16.04
1398 constraints: mem=1G
1399 options:
1400 network-manager: Neutron
1401- quantum-security-groups: "yes"
1402 neutron-gateway:
1403- branch: https://github.com/openstack/charm-neutron-gateway;stable
1404+ branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
1405 constraints: mem=1G
1406 options:
1407 instance-mtu: 1300
1408 cinder:
1409- branch: https://github.com/openstack/charm-cinder;stable
1410+ branch: https://github.com/openstack/charm-cinder;stable/16.04
1411 options:
1412 block-device: "None"
1413 glance-api-version: 2
1414 constraints: mem=1G
1415 cinder-ceph:
1416- branch: https://github.com/openstack/charm-cinder-ceph;stable
1417+ branch: https://github.com/openstack/charm-cinder-ceph;stable/16.04
1418 glance:
1419- branch: https://github.com/openstack/charm-glance;stable
1420+ branch: https://github.com/openstack/charm-glance;stable/16.04
1421 constraints: mem=1G
1422 swift-proxy:
1423- branch: https://github.com/openstack/charm-swift-proxy;stable
1424+ branch: https://github.com/openstack/charm-swift-proxy;stable/16.04
1425 constraints: mem=1G
1426 options:
1427 zone-assignment: manual
1428 replicas: 3
1429 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
1430 swift-storage-z1:
1431- branch: https://github.com/openstack/charm-swift-storage;stable
1432+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1433 constraints: mem=1G
1434 options:
1435 zone: 1
1436 block-device: vdb
1437 overwrite: "true"
1438 swift-storage-z2:
1439- branch: https://github.com/openstack/charm-swift-storage;stable
1440+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1441 constraints: mem=1G
1442 options:
1443 zone: 2
1444 block-device: vdb
1445 overwrite: "true"
1446 swift-storage-z3:
1447- branch: https://github.com/openstack/charm-swift-storage;stable
1448+ branch: https://github.com/openstack/charm-swift-storage;stable/16.04
1449 constraints: mem=1G
1450 options:
1451 zone: 3
1452 block-device: vdb
1453 overwrite: "true"
1454 ceilometer:
1455- branch: https://github.com/openstack/charm-ceilometer;stable
1456+ branch: https://github.com/openstack/charm-ceilometer;stable/16.04
1457 constraints: mem=1G
1458 ceilometer-agent:
1459- branch: https://github.com/openstack/charm-ceilometer-agent;stable
1460+ branch: https://github.com/openstack/charm-ceilometer-agent;stable/16.04
1461 heat:
1462- branch: https://github.com/openstack/charm-heat;stable
1463+ branch: https://github.com/openstack/charm-heat;stable/16.04
1464 mongodb:
1465 branch: lp:charms/trusty/mongodb
1466 constraints: mem=1G
1467@@ -146,12 +145,12 @@
1468 inherits: openstack-singlerabbit
1469 services:
1470 neutron-api:
1471- branch: https://github.com/openstack/charm-neutron-api;stable
1472+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1473 constraints: mem=1G
1474 options:
1475 neutron-security-groups: True
1476 neutron-openvswitch:
1477- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1478+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1479 relations:
1480 - [ neutron-api, mysql ]
1481 - [ neutron-api, rabbitmq-server ]
1482@@ -165,14 +164,14 @@
1483 inherits: openstack-services
1484 services:
1485 neutron-api:
1486- branch: https://github.com/openstack/charm-neutron-api;stable
1487+ branch: https://github.com/openstack/charm-neutron-api;stable/16.04
1488 constraints: mem=1G
1489 options:
1490 neutron-security-groups: True
1491 neutron-openvswitch:
1492- branch: https://github.com/openstack/charm-neutron-openvswitch;stable
1493+ branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
1494 rabbitmq-server-neutron:
1495- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1496+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1497 constraints: mem=1G
1498 relations:
1499 - [ neutron-api, mysql ]
1500
1501=== modified file 'bundles/sparse/next.yaml'
1502--- bundles/sparse/next.yaml 2016-04-18 14:19:17 +0000
1503+++ bundles/sparse/next.yaml 2016-04-21 10:53:55 +0000
1504@@ -173,7 +173,7 @@
1505 neutron-openvswitch:
1506 branch: https://github.com/openstack/charm-neutron-openvswitch
1507 rabbitmq-server-neutron:
1508- branch: https://github.com/openstack/charm-rabbitmq-server;stable
1509+ branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
1510 constraints: mem=1G
1511 relations:
1512 - [ neutron-api, mysql ]

Subscribers

People subscribed via source and target branches

to status/vote changes: