Merge lp:~corey.bryant/openstack-charm-testing/add-new-svcs-to-sparse into lp:openstack-charm-testing

Proposed by Corey Bryant on 2016-12-13
Status: Merged
Approved by: Ryan Beisner on 2017-02-01
Approved revision: 263
Merged at revision: 265
Proposed branch: lp:~corey.bryant/openstack-charm-testing/add-new-svcs-to-sparse
Merge into: lp:openstack-charm-testing
Diff against target: 214 lines (+115/-10)
2 files modified
bundles/sparse/default.yaml (+73/-3)
bundles/sparse/next.yaml (+42/-7)
To merge this branch: bzr merge lp:~corey.bryant/openstack-charm-testing/add-new-svcs-to-sparse
Reviewer Review Type Date Requested Status
Ryan Beisner 2016-12-13 Needs Information on 2017-01-10
OpenStack Charm Testing Maintainers 2016-12-13 Pending
Review via email: mp+313156@code.launchpad.net

Commit Message

Add aodh, barbican, and designate to sparse default/next bundles.

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

I'm pretty sure one or more of these have Trusty support. Can you check into that before we proceed? Thanks!

review: Needs Information
Corey Bryant (corey.bryant) wrote :

aodh and designate do have trusty charm versions. I started working on these updates, but I'm not sure if it's worth adding them to the bundle for trusty, since the charm/packages were new in yakkety.

Corey Bryant (corey.bryant) wrote :

clarification: the charms were new in yakkety

Ryan Beisner (1chb1n) wrote :

If the charms support Trusty (and some do), we need the bundles to define those targets imho. Otherwise we're releasing charm to a series that isn't tested.

If the practicality measure says why-bother @ trusty on those new charms, then we should confer, discuss and decide to remove that series from the charm metadata - and if so, then my reservations here evaporate. :-)

review: Needs Information
James Page (james-page) wrote :

I think we agreed that trusty-mitaka would be support for deployment on
trusty as that's the last series supported for 14.04.
On Tue, 10 Jan 2017 at 18:02, Ryan Beisner <email address hidden>
wrote:

> Review: Needs Information
>
> If the charms support Trusty (and some do), we need the bundles to define
> those targets imho. Otherwise we're releasing charm to a series that isn't
> tested.
>
> If the practicality measure says why-bother @ trusty on those new charms,
> then we should confer, discuss and decide to remove that series from the
> charm metadata - and if so, then my reservations here evaporate. :-)
> --
>
> https://code.launchpad.net/~corey.bryant/openstack-charm-testing/add-new-svcs-to-sparse/+merge/313156
> Your team OpenStack Charmers is subscribed to branch
> lp:openstack-charm-testing.
>

263. By Corey Bryant on 2017-02-01

Enable aodh and designate for trusty-mitaka

Corey Bryant (corey.bryant) wrote :

Ok finally got back to this! aodh and designate are now deployed if trusty-mitaka or greater is chosen. And if xenial or greater is chosen barbican is added to the deployment.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/sparse/default.yaml'
2--- bundles/sparse/default.yaml 2016-09-29 12:56:01 +0000
3+++ bundles/sparse/default.yaml 2017-02-01 16:53:15 +0000
4@@ -117,7 +117,7 @@
5 - [ glance, mysql ]
6 - [ glance, keystone ]
7 - [ glance, ceph ]
8- - [ glance, cinder ]
9+ - [ glance, "cinder:image-service" ]
10 - [ glance, rabbitmq-server ]
11 - [ cinder, mysql ]
12 - [ cinder, rabbitmq-server ]
13@@ -169,6 +169,41 @@
14 max-connections: 20000
15 root-password: ChangeMe123
16 sst-password: ChangeMe123
17+openstack-services-trusty-mitaka:
18+ inherits: openstack-services
19+ services:
20+ aodh:
21+ charm: cs:~openstack-charmers/aodh
22+ constraints: mem=1G
23+ designate:
24+ charm: cs:~openstack-charmers/designate
25+ constraints: mem=1G
26+ options:
27+ nameservers: 'ns1.ubuntu.com'
28+ nova-domain: 'serverstack.ubuntu.com.'
29+ neutron-domain: 'serverstack.ubuntu.com.'
30+ nova-domain-email: 'bob@serverstack.ubuntu.com'
31+ neutron-domain-email: 'bob@serverstack.ubuntu.com'
32+ designate-bind:
33+ charm: cs:~openstack-charmers/designate-bind
34+ relations:
35+ - [ aodh, rabbitmq-server ]
36+ - [ aodh, mysql ]
37+ - [ aodh, keystone ]
38+ - [ designate, keystone ]
39+ - [ designate, mysql ]
40+ - [ designate, rabbitmq-server ]
41+ - [ designate, designate-bind ]
42+openstack-services-xenial:
43+ inherits: openstack-services-trusty-mitaka
44+ services:
45+ barbican:
46+ charm: cs:~openstack-charmers/barbican
47+ constraints: mem=1G
48+ relations:
49+ - [ barbican, rabbitmq-server ]
50+ - [ barbican, mysql ]
51+ - [ barbican, keystone ]
52 # icehouse
53 precise-icehouse:
54 inherits: openstack-services-legacy
55@@ -250,7 +285,7 @@
56 openstack-origin: distro-proposed
57 # mitaka
58 trusty-mitaka:
59- inherits: openstack-services
60+ inherits: openstack-services-trusty-mitaka
61 series: trusty
62 overrides:
63 openstack-origin: cloud:trusty-mitaka
64@@ -266,10 +301,45 @@
65 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
66 source: ppa:ubuntu-cloud-archive/mitaka-staging
67 xenial-mitaka:
68- inherits: openstack-services
69+ inherits: openstack-services-xenial
70 series: xenial
71 xenial-mitaka-proposed:
72 inherits: xenial-mitaka
73 overrides:
74 source: proposed
75 openstack-origin: distro-proposed
76+# newton
77+xenial-newton:
78+ inherits: openstack-services-xenial
79+ series: xenial
80+ overrides:
81+ openstack-origin: cloud:xenial-newton
82+ source: cloud:xenial-newton
83+xenial-newton-proposed:
84+ inherits: xenial-newton
85+ overrides:
86+ openstack-origin: cloud:xenial-newton/proposed
87+ source: cloud:xenial-newton/proposed
88+xenial-newton-staging:
89+ inherits: xenial-newton
90+ overrides:
91+ openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
92+ source: ppa:ubuntu-cloud-archive/newton-staging
93+xenial-newton-branch:
94+ inherits: xenial-newton
95+ overrides:
96+ openstack-origin: ppa:openstack-ubuntu-testing/newton
97+ source: ppa:openstack-ubuntu-testing/newton
98+yakkety-newton:
99+ inherits: openstack-services-xenial
100+ series: yakkety
101+yakkety-newton-proposed:
102+ inherits: yakkety-newton
103+ overrides:
104+ source: proposed
105+ openstack-origin: distro-proposed
106+yakkety-newton-branch:
107+ inherits: yakkety-newton
108+ overrides:
109+ openstack-origin: ppa:openstack-ubuntu-testing/newton
110+ source: ppa:openstack-ubuntu-testing/newton
111
112=== modified file 'bundles/sparse/next.yaml'
113--- bundles/sparse/next.yaml 2016-11-11 17:43:16 +0000
114+++ bundles/sparse/next.yaml 2017-02-01 16:53:15 +0000
115@@ -169,6 +169,41 @@
116 max-connections: 20000
117 root-password: ChangeMe123
118 sst-password: ChangeMe123
119+openstack-services-trusty-mitaka:
120+ inherits: openstack-services
121+ services:
122+ aodh:
123+ charm: cs:~openstack-charmers-next/aodh
124+ constraints: mem=1G
125+ designate:
126+ charm: cs:~openstack-charmers-next/designate
127+ constraints: mem=1G
128+ options:
129+ nameservers: 'ns1.ubuntu.com'
130+ nova-domain: 'serverstack.ubuntu.com.'
131+ neutron-domain: 'serverstack.ubuntu.com.'
132+ nova-domain-email: 'bob@serverstack.ubuntu.com'
133+ neutron-domain-email: 'bob@serverstack.ubuntu.com'
134+ designate-bind:
135+ charm: cs:~openstack-charmers-next/designate-bind
136+ relations:
137+ - [ aodh, rabbitmq-server ]
138+ - [ aodh, mysql ]
139+ - [ aodh, keystone ]
140+ - [ designate, keystone ]
141+ - [ designate, mysql ]
142+ - [ designate, rabbitmq-server ]
143+ - [ designate, designate-bind ]
144+openstack-services-xenial:
145+ inherits: openstack-services-trusty-mitaka
146+ services:
147+ barbican:
148+ charm: cs:~openstack-charmers-next/barbican
149+ constraints: mem=1G
150+ relations:
151+ - [ barbican, rabbitmq-server ]
152+ - [ barbican, mysql ]
153+ - [ barbican, keystone ]
154 # icehouse
155 precise-icehouse:
156 inherits: openstack-services-legacy
157@@ -250,7 +285,7 @@
158 openstack-origin: distro-proposed
159 # mitaka
160 trusty-mitaka:
161- inherits: openstack-services
162+ inherits: openstack-services-trusty-mitaka
163 series: trusty
164 overrides:
165 openstack-origin: cloud:trusty-mitaka
166@@ -266,7 +301,7 @@
167 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
168 source: ppa:ubuntu-cloud-archive/mitaka-staging
169 xenial-mitaka:
170- inherits: openstack-services
171+ inherits: openstack-services-xenial
172 series: xenial
173 xenial-mitaka-proposed:
174 inherits: xenial-mitaka
175@@ -275,7 +310,7 @@
176 openstack-origin: distro-proposed
177 # newton
178 xenial-newton:
179- inherits: openstack-services
180+ inherits: openstack-services-xenial
181 series: xenial
182 overrides:
183 openstack-origin: cloud:xenial-newton
184@@ -296,7 +331,7 @@
185 openstack-origin: ppa:openstack-ubuntu-testing/newton
186 source: ppa:openstack-ubuntu-testing/newton
187 yakkety-newton:
188- inherits: openstack-services
189+ inherits: openstack-services-xenial
190 series: yakkety
191 yakkety-newton-proposed:
192 inherits: yakkety-newton
193@@ -310,10 +345,10 @@
194 source: ppa:openstack-ubuntu-testing/newton
195 # ocata
196 xenial-ocata:
197- inherits: openstack-services
198+ inherits: openstack-services-xenial
199 series: xenial
200 overrides:
201- openstack-origin: cloud:xenial-octata
202+ openstack-origin: cloud:xenial-ocata
203 source: cloud:xenial-ocata
204 xenial-ocata-proposed:
205 inherits: xenial-ocata
206@@ -331,7 +366,7 @@
207 openstack-origin: ppa:openstack-ubuntu-testing/ocata
208 source: ppa:openstack-ubuntu-testing/ocata
209 zesty-ocata:
210- inherits: openstack-services
211+ inherits: openstack-services-xenial
212 series: zesty
213 zesty-ocata-proposed:
214 inherits: zesty-ocata

Subscribers

People subscribed via source and target branches

to status/vote changes: