OpenStack Charm Testing

Merge lp:~chris.macnaughton/openstack-charm-testing/trunk into lp:openstack-charm-testing

  1. trunk
  2. Merge into trunk
Proposed by Chris MacNaughton
Status: Rejected
Rejected by: Ryan Beisner
Proposed branch: lp:~chris.macnaughton/openstack-charm-testing/trunk
Merge into: lp:openstack-charm-testing
Diff against target: 194 lines (+61/-11)
2 files modified
bundles/lxd/default.yaml (+23/-5)
bundles/lxd/next.yaml (+38/-6)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-charm-testing/trunk
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Resubmitting
Chris MacNaughton (community) Needs Fixing
Review via email: mp+325313@code.launchpad.net

Description of the change

Adds ceph to nova-lxd bundles

To post a comment you must log in.
lp:~chris.macnaughton/openstack-charm-testing/trunk updated
301. By Chris MacNaughton

add new cinder-ceph to nova-compute relation

Also brings in minimal changes from general `default`
and `next.yaml`

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

for reference, deploying the default.yaml with xenial-mitaka: https://pastebin.ubuntu.com/24857187/

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

This needs a change to charm-cinder (at least) before it can fully work

review: Needs Fixing
Revision history for this message
Ryan Beisner (1chb1n) wrote :

The code repo for this project is now at the following location:
https://github.com/openstack-charmers/openstack-charm-testing

review: Needs Resubmitting

Unmerged revisions

301. By Chris MacNaughton

add new cinder-ceph to nova-compute relation

Also brings in minimal changes from general `default`
and `next.yaml`

300. By Chris MacNaughton

Update LXD bundles with Ceph

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/lxd/default.yaml'
2--- bundles/lxd/default.yaml 2017-03-27 18:15:29 +0000
3+++ bundles/lxd/default.yaml 2017-06-09 15:10:44 +0000
4@@ -6,6 +6,17 @@
5 rabbitmq-server:
6 branch: https://github.com/openstack/charm-rabbitmq-server;stable/17.02
7 constraints: mem=1G
8+ ceph:
9+ branch: https://github.com/openstack/charm-ceph;stable/17.02
10+ num_units: 3
11+ constraints: mem=1G
12+ options:
13+ monitor-count: 3
14+ fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
15+ monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
16+ osd-devices: /dev/vdb
17+ osd-reformat: "yes"
18+ ephemeral-unmount: /mnt
19 keystone:
20 branch: https://github.com/openstack/charm-keystone;stable/17.02
21 constraints: mem=1G
22@@ -31,7 +42,7 @@
23 network-manager: Neutron
24 neutron-gateway:
25 branch: https://github.com/openstack/charm-neutron-gateway;stable/17.02
26- constraints: mem=2G
27+ constraints: mem=4G
28 options:
29 instance-mtu: 1300
30 bridge-mappings: physnet1:br-ex
31@@ -46,11 +57,11 @@
32 cinder:
33 branch: https://github.com/openstack/charm-cinder;stable/17.02
34 options:
35- block-device: /dev/vdb
36+ block-device: "None"
37 glance-api-version: 2
38- ephemeral-unmount: /mnt
39- overwrite: "true"
40- constraints: mem=4G
41+ constraints: mem=1G
42+ cinder-ceph:
43+ branch: https://github.com/openstack/charm-cinder-ceph;stable/17.02
44 glance:
45 branch: https://github.com/openstack/charm-glance;stable/17.02
46 constraints: mem=1G
47@@ -110,14 +121,18 @@
48 - - nova-compute
49 - rabbitmq-server:amqp
50 - [ nova-compute, glance ]
51+ - [ nova-compute, ceph ]
52 - [ glance, mysql ]
53 - [ glance, keystone ]
54 - [ glance, rabbitmq-server ]
55+ - [ glance, ceph ]
56 - [ glance, "cinder:image-service" ]
57 - [ cinder, mysql ]
58 - [ cinder, rabbitmq-server ]
59 - [ cinder, nova-cloud-controller ]
60 - [ cinder, keystone ]
61+ - [ cinder, cinder-ceph ]
62+ - [ cinder-ceph, ceph ]
63 - [ neutron-gateway, nova-cloud-controller ]
64 - [ openstack-dashboard, keystone ]
65 - [ swift-proxy, keystone ]
66@@ -296,6 +311,8 @@
67 #inherits: openstack-services-xenial
68 inherits: openstack-services
69 series: zesty
70+ relations:
71+ - [ cinder-ceph, nova-compute ]
72 zesty-ocata-proposed:
73 inherits: zesty-ocata
74 overrides:
75@@ -306,3 +323,4 @@
76 overrides:
77 openstack-origin: ppa:openstack-ubuntu-testing/ocata
78 source: ppa:openstack-ubuntu-testing/ocata
79+
80
81=== modified file 'bundles/lxd/next.yaml'
82--- bundles/lxd/next.yaml 2017-05-24 08:28:51 +0000
83+++ bundles/lxd/next.yaml 2017-06-09 15:10:44 +0000
84@@ -6,6 +6,17 @@
85 rabbitmq-server:
86 branch: https://github.com/openstack/charm-rabbitmq-server
87 constraints: mem=1G
88+ ceph:
89+ branch: https://github.com/openstack/charm-ceph
90+ num_units: 3
91+ constraints: mem=1G
92+ options:
93+ monitor-count: 3
94+ fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
95+ monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
96+ osd-devices: /dev/vdb
97+ osd-reformat: "yes"
98+ ephemeral-unmount: /mnt
99 keystone:
100 branch: https://github.com/openstack/charm-keystone
101 constraints: mem=1G
102@@ -31,7 +42,7 @@
103 network-manager: Neutron
104 neutron-gateway:
105 branch: https://github.com/openstack/charm-neutron-gateway
106- constraints: mem=2G
107+ constraints: mem=4G
108 options:
109 instance-mtu: 1300
110 bridge-mappings: physnet1:br-ex
111@@ -46,11 +57,11 @@
112 cinder:
113 branch: https://github.com/openstack/charm-cinder
114 options:
115- block-device: /dev/vdb
116+ block-device: "None"
117 glance-api-version: 2
118- ephemeral-unmount: /mnt
119- overwrite: "true"
120- constraints: mem=4G
121+ constraints: mem=1G
122+ cinder-ceph:
123+ branch: https://github.com/openstack/charm-cinder-ceph
124 glance:
125 branch: https://github.com/openstack/charm-glance
126 constraints: mem=1G
127@@ -110,14 +121,18 @@
128 - - nova-compute
129 - rabbitmq-server:amqp
130 - [ nova-compute, glance ]
131+ - [ nova-compute, ceph ]
132 - [ glance, mysql ]
133 - [ glance, keystone ]
134 - [ glance, rabbitmq-server ]
135+ - [ glance, ceph ]
136 - [ glance, "cinder:image-service" ]
137 - [ cinder, mysql ]
138 - [ cinder, rabbitmq-server ]
139 - [ cinder, nova-cloud-controller ]
140 - [ cinder, keystone ]
141+ - [ cinder, cinder-ceph ]
142+ - [ cinder-ceph, ceph ]
143 - [ neutron-gateway, nova-cloud-controller ]
144 - [ openstack-dashboard, keystone ]
145 - [ swift-proxy, keystone ]
146@@ -296,6 +311,8 @@
147 #inherits: openstack-services-xenial
148 inherits: openstack-services
149 series: zesty
150+ relations:
151+ - [ cinder-ceph, nova-compute ]
152 zesty-ocata-proposed:
153 inherits: zesty-ocata
154 overrides:
155@@ -306,13 +323,18 @@
156 overrides:
157 openstack-origin: ppa:openstack-ubuntu-testing/ocata
158 source: ppa:openstack-ubuntu-testing/ocata
159-# Pike
160+# pike
161 xenial-pike:
162+ #NOTE(coreycb): Temporarily disable reactive charms until
163+ # https://bugs.launchpad.net/bugs/1643027 is resolved.
164+ #inherits: openstack-services-xenial
165 inherits: openstack-services
166 series: xenial
167 overrides:
168 openstack-origin: cloud:xenial-pike
169 source: cloud:xenial-pike
170+ relations:
171+ - [ cinder-ceph, nova-compute ]
172 xenial-pike-proposed:
173 inherits: xenial-pike
174 overrides:
175@@ -328,9 +350,19 @@
176 overrides:
177 openstack-origin: ppa:openstack-ubuntu-testing/pike
178 source: ppa:openstack-ubuntu-testing/pike
179+xenial-pike-trunk:
180+ inherits: xenial-pike
181+ overrides:
182+ openstack-origin: ppa:openstack-ubuntu-testing/pike
183+ source: ppa:openstack-ubuntu-testing/pike
184 artful-pike:
185+ #NOTE(coreycb): Temporarily disable reactive charms until
186+ # https://bugs.launchpad.net/bugs/1643027 is resolved.
187+ #inherits: openstack-services-xenial
188 inherits: openstack-services
189 series: artful
190+ relations:
191+ - [ cinder-ceph, nova-compute ]
192 artful-pike-proposed:
193 inherits: artful-pike
194 overrides:

Subscribers

People subscribed via source and target branches

to status/vote changes: