Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-mitakatastic into lp:openstack-mojo-specs
- mojo-openstack-specs-mitakatastic
- Merge into mojo-openstack-specs
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 242 |
Proposed branch: | lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-mitakatastic |
Merge into: | lp:openstack-mojo-specs |
Diff against target: |
502 lines (+275/-27) 11 files modified
helper/bundles/full.yaml (+6/-0) helper/bundles/ha.yaml (+23/-0) helper/scripts/mojo-spec-check.py (+2/-1) helper/setup/upgrade_openstack.py (+51/-26) helper/utils/os_versions.py (+105/-0) specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt (+2/-0) specs/full_stack/next_deploy/mitaka/manifest (+22/-0) specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt (+3/-0) specs/full_stack/next_ha_oneshot/mitaka/manifest (+31/-0) specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt (+2/-0) specs/full_stack/next_openstack_upgrade/liberty/manifest (+28/-0) |
To merge this branch: | bzr merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-mitakatastic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charm Testing Maintainers | Pending | ||
Review via email: mp+283441@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'helper/bundles/full.yaml' | |||
2 | --- helper/bundles/full.yaml 2015-08-05 08:40:27 +0000 | |||
3 | +++ helper/bundles/full.yaml 2016-01-21 13:19:38 +0000 | |||
4 | @@ -277,6 +277,12 @@ | |||
5 | 277 | overrides: | 277 | overrides: |
6 | 278 | openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging | 278 | openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
7 | 279 | source: ppa:ubuntu-cloud-archive/liberty-staging | 279 | source: ppa:ubuntu-cloud-archive/liberty-staging |
8 | 280 | trusty-mitaka: | ||
9 | 281 | inherits: openstack-icehouse | ||
10 | 282 | series: trusty | ||
11 | 283 | overrides: | ||
12 | 284 | openstack-origin: cloud:trusty-mitaka/proposed | ||
13 | 285 | source: cloud:trusty-mitaka | ||
14 | 280 | wily-liberty: | 286 | wily-liberty: |
15 | 281 | inherits: openstack-icehouse | 287 | inherits: openstack-icehouse |
16 | 282 | series: wily | 288 | series: wily |
17 | 283 | 289 | ||
18 | === modified file 'helper/bundles/ha.yaml' | |||
19 | --- helper/bundles/ha.yaml 2015-11-02 17:05:14 +0000 | |||
20 | +++ helper/bundles/ha.yaml 2016-01-21 13:19:38 +0000 | |||
21 | @@ -256,3 +256,26 @@ | |||
22 | 256 | vivid-kilo-ha: | 256 | vivid-kilo-ha: |
23 | 257 | inherits: openstack-services | 257 | inherits: openstack-services |
24 | 258 | series: vivid | 258 | series: vivid |
25 | 259 | trusty-mitaka-ha: | ||
26 | 260 | inherits: openstack-services | ||
27 | 261 | series: trusty | ||
28 | 262 | overrides: | ||
29 | 263 | openstack-origin: cloud:trusty-mitaka/proposed | ||
30 | 264 | source: cloud:trusty-mitaka | ||
31 | 265 | trusty-mitaka-proposed: | ||
32 | 266 | inherits: openstack-services | ||
33 | 267 | series: trusty | ||
34 | 268 | overrides: | ||
35 | 269 | openstack-origin: cloud:trusty-mitaka/proposed | ||
36 | 270 | source: cloud:trusty-mitaka/proposed | ||
37 | 271 | xenial-mitaka-ha: | ||
38 | 272 | inherits: openstack-services | ||
39 | 273 | series: xenial | ||
40 | 274 | services: | ||
41 | 275 | mysql: | ||
42 | 276 | branch: lp:charms/trusty/mysql | ||
43 | 277 | xenial-mitaka-proposed: | ||
44 | 278 | inherits: xenial-mitaka | ||
45 | 279 | overrides: | ||
46 | 280 | source: proposed | ||
47 | 281 | openstack-origin: distro-proposed | ||
48 | 259 | 282 | ||
49 | === modified file 'helper/scripts/mojo-spec-check.py' | |||
50 | --- helper/scripts/mojo-spec-check.py 2015-10-20 03:18:37 +0000 | |||
51 | +++ helper/scripts/mojo-spec-check.py 2016-01-21 13:19:38 +0000 | |||
52 | @@ -24,7 +24,8 @@ | |||
53 | 24 | 'icehouse': ['precise', 'trusty'], | 24 | 'icehouse': ['precise', 'trusty'], |
54 | 25 | 'juno': ['trusty'], | 25 | 'juno': ['trusty'], |
55 | 26 | 'kilo': ['trusty', 'vivid'], | 26 | 'kilo': ['trusty', 'vivid'], |
57 | 27 | 'liberty': ['trusty', 'wily'] | 27 | 'liberty': ['trusty', 'wily'], |
58 | 28 | 'mitaka': ['trusty', 'xenial'], | ||
59 | 28 | } | 29 | } |
60 | 29 | 30 | ||
61 | 30 | 31 | ||
62 | 31 | 32 | ||
63 | === modified file 'helper/setup/upgrade_openstack.py' | |||
64 | --- helper/setup/upgrade_openstack.py 2015-10-13 14:19:50 +0000 | |||
65 | +++ helper/setup/upgrade_openstack.py 2016-01-21 13:19:38 +0000 | |||
66 | @@ -1,21 +1,15 @@ | |||
67 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
68 | 2 | import six | ||
69 | 3 | import re | ||
70 | 2 | import argparse | 4 | import argparse |
71 | 3 | import sys | 5 | import sys |
72 | 4 | import utils.mojo_utils as mojo_utils | 6 | import utils.mojo_utils as mojo_utils |
73 | 5 | import logging | 7 | import logging |
87 | 6 | from collections import OrderedDict | 8 | from utils.os_versions import ( |
88 | 7 | 9 | OPENSTACK_CODENAMES, | |
89 | 8 | OPENSTACK_CODENAMES = OrderedDict([ | 10 | SWIFT_CODENAMES, |
90 | 9 | ('2011.2', 'diablo'), | 11 | PACKAGE_CODENAMES, |
91 | 10 | ('2012.1', 'essex'), | 12 | ) |
79 | 11 | ('2012.2', 'folsom'), | ||
80 | 12 | ('2013.1', 'grizzly'), | ||
81 | 13 | ('2013.2', 'havana'), | ||
82 | 14 | ('2014.1', 'icehouse'), | ||
83 | 15 | ('2014.2', 'juno'), | ||
84 | 16 | ('2015.1', 'kilo'), | ||
85 | 17 | ('2015.2', 'liberty'), | ||
86 | 18 | ]) | ||
92 | 19 | 13 | ||
93 | 20 | CHARM_TYPES = { | 14 | CHARM_TYPES = { |
94 | 21 | 'neutron': { | 15 | 'neutron': { |
95 | @@ -60,15 +54,43 @@ | |||
96 | 60 | {'name': 'ceilometer', 'type': CHARM_TYPES['ceilometer']}, | 54 | {'name': 'ceilometer', 'type': CHARM_TYPES['ceilometer']}, |
97 | 61 | ] | 55 | ] |
98 | 62 | 56 | ||
104 | 63 | 57 | # XXX get_swift_codename and get_os_code_info are based on the functions with | |
105 | 64 | def get_os_code_info(pkg_version): | 58 | # the same name in ~charm-helpers/charmhelpers/contrib/openstack/utils.py |
106 | 65 | for entry in OPENSTACK_CODENAMES: | 59 | # It'd be neat if we actually shared a common library. |
107 | 66 | if entry in pkg_version: | 60 | |
108 | 67 | return {'code_num': entry, 'code_name': OPENSTACK_CODENAMES[entry]} | 61 | |
109 | 62 | def get_swift_codename(version): | ||
110 | 63 | '''Determine OpenStack codename that corresponds to swift version.''' | ||
111 | 64 | codenames = [k for k, v in six.iteritems(SWIFT_CODENAMES) if version in v] | ||
112 | 65 | return codenames[0] | ||
113 | 66 | |||
114 | 67 | |||
115 | 68 | def get_os_code_info(package, pkg_version): | ||
116 | 69 | # {'code_num': entry, 'code_name': OPENSTACK_CODENAMES[entry]} | ||
117 | 70 | pkg_version = pkg_version.split(':')[1:][0] | ||
118 | 71 | if 'swift' in package: | ||
119 | 72 | # Fully x.y.z match for swift versions | ||
120 | 73 | match = re.match('^(\d+)\.(\d+)\.(\d+)', pkg_version) | ||
121 | 74 | else: | ||
122 | 75 | # x.y match only for 20XX.X | ||
123 | 76 | # and ignore patch level for other packages | ||
124 | 77 | match = re.match('^(\d+)\.(\d+)', pkg_version) | ||
125 | 78 | |||
126 | 79 | if match: | ||
127 | 80 | pkg_version = match.group(0) | ||
128 | 81 | if (package in PACKAGE_CODENAMES and | ||
129 | 82 | pkg_version in PACKAGE_CODENAMES[package]): | ||
130 | 83 | return PACKAGE_CODENAMES[package][pkg_version] | ||
131 | 84 | else: | ||
132 | 85 | # < Liberty co-ordinated project versions | ||
133 | 86 | if 'swift' in package: | ||
134 | 87 | return get_swift_codename(pkg_version) | ||
135 | 88 | else: | ||
136 | 89 | return OPENSTACK_CODENAMES[pkg_version] | ||
137 | 68 | 90 | ||
138 | 69 | 91 | ||
139 | 70 | def next_release(release): | 92 | def next_release(release): |
141 | 71 | old_index = OPENSTACK_CODENAMES.keys().index(release) | 93 | old_index = OPENSTACK_CODENAMES.values().index(release) |
142 | 72 | new_index = old_index + 1 | 94 | new_index = old_index + 1 |
143 | 73 | return OPENSTACK_CODENAMES.items()[new_index] | 95 | return OPENSTACK_CODENAMES.items()[new_index] |
144 | 74 | 96 | ||
145 | @@ -80,14 +102,15 @@ | |||
146 | 80 | continue | 102 | continue |
147 | 81 | version = mojo_utils.get_pkg_version(service['name'], | 103 | version = mojo_utils.get_pkg_version(service['name'], |
148 | 82 | service['type']['pkg']) | 104 | service['type']['pkg']) |
150 | 83 | versions[service['name']] = get_os_code_info(version) | 105 | versions[service['name']] = get_os_code_info(service['type']['pkg'], |
151 | 106 | version) | ||
152 | 84 | return versions | 107 | return versions |
153 | 85 | 108 | ||
154 | 86 | 109 | ||
155 | 87 | def get_lowest_os_version(current_versions): | 110 | def get_lowest_os_version(current_versions): |
157 | 88 | lowest_version = {'code_num': '2100', 'code_name': 'zebra'} | 111 | lowest_version = 'zebra' |
158 | 89 | for svc in current_versions.keys(): | 112 | for svc in current_versions.keys(): |
160 | 90 | if current_versions[svc]['code_name'] < lowest_version['code_name']: | 113 | if current_versions[svc] < lowest_version: |
161 | 91 | lowest_version = current_versions[svc] | 114 | lowest_version = current_versions[svc] |
162 | 92 | return lowest_version | 115 | return lowest_version |
163 | 93 | 116 | ||
164 | @@ -95,7 +118,7 @@ | |||
165 | 95 | def get_upgrade_targets(target_release, current_versions): | 118 | def get_upgrade_targets(target_release, current_versions): |
166 | 96 | upgrade_list = [] | 119 | upgrade_list = [] |
167 | 97 | for svc in current_versions.keys(): | 120 | for svc in current_versions.keys(): |
169 | 98 | if current_versions[svc]['code_name'] < target_release: | 121 | if current_versions[svc] < target_release: |
170 | 99 | upgrade_list.append(svc) | 122 | upgrade_list.append(svc) |
171 | 100 | return upgrade_list | 123 | return upgrade_list |
172 | 101 | 124 | ||
173 | @@ -116,7 +139,7 @@ | |||
174 | 116 | # If in auto mode find the lowest value openstack release across all | 139 | # If in auto mode find the lowest value openstack release across all |
175 | 117 | # services and make sure all servcies are upgraded to one release | 140 | # services and make sure all servcies are upgraded to one release |
176 | 118 | # higher than the lowest | 141 | # higher than the lowest |
178 | 119 | lowest_release = get_lowest_os_version(current_versions)['code_num'] | 142 | lowest_release = get_lowest_os_version(current_versions) |
179 | 120 | target_release = next_release(lowest_release)[1] | 143 | target_release = next_release(lowest_release)[1] |
180 | 121 | # Get a list of services that need upgrading | 144 | # Get a list of services that need upgrading |
181 | 122 | needs_upgrade = get_upgrade_targets(target_release, current_versions) | 145 | needs_upgrade = get_upgrade_targets(target_release, current_versions) |
182 | @@ -132,8 +155,10 @@ | |||
183 | 132 | logging.info('Upgrading {} to {}'.format(service['name'], | 155 | logging.info('Upgrading {} to {}'.format(service['name'], |
184 | 133 | target_release)) | 156 | target_release)) |
185 | 134 | ubuntu_version = mojo_utils.get_ubuntu_version(service['name']) | 157 | ubuntu_version = mojo_utils.get_ubuntu_version(service['name']) |
188 | 135 | option = "{}=cloud:{}-{}".format(service['type']['origin_setting'], | 158 | option = "{}=cloud:{}-{}/proposed".format( |
189 | 136 | ubuntu_version, target_release) | 159 | service['type']['origin_setting'], |
190 | 160 | ubuntu_version, target_release | ||
191 | 161 | ) | ||
192 | 137 | mojo_utils.juju_set(service['name'], option, wait=True) | 162 | mojo_utils.juju_set(service['name'], option, wait=True) |
193 | 138 | 163 | ||
194 | 139 | if __name__ == "__main__": | 164 | if __name__ == "__main__": |
195 | 140 | 165 | ||
196 | === added file 'helper/utils/os_versions.py' | |||
197 | --- helper/utils/os_versions.py 1970-01-01 00:00:00 +0000 | |||
198 | +++ helper/utils/os_versions.py 2016-01-21 13:19:38 +0000 | |||
199 | @@ -0,0 +1,105 @@ | |||
200 | 1 | from collections import OrderedDict | ||
201 | 2 | |||
202 | 3 | OPENSTACK_CODENAMES = OrderedDict([ | ||
203 | 4 | ('2011.2', 'diablo'), | ||
204 | 5 | ('2012.1', 'essex'), | ||
205 | 6 | ('2012.2', 'folsom'), | ||
206 | 7 | ('2013.1', 'grizzly'), | ||
207 | 8 | ('2013.2', 'havana'), | ||
208 | 9 | ('2014.1', 'icehouse'), | ||
209 | 10 | ('2014.2', 'juno'), | ||
210 | 11 | ('2015.1', 'kilo'), | ||
211 | 12 | ('2015.2', 'liberty'), | ||
212 | 13 | ('2016.1', 'mitaka'), | ||
213 | 14 | ]) | ||
214 | 15 | |||
215 | 16 | UBUNTU_OPENSTACK_RELEASE = OrderedDict([ | ||
216 | 17 | ('oneiric', 'diablo'), | ||
217 | 18 | ('precise', 'essex'), | ||
218 | 19 | ('quantal', 'folsom'), | ||
219 | 20 | ('raring', 'grizzly'), | ||
220 | 21 | ('saucy', 'havana'), | ||
221 | 22 | ('trusty', 'icehouse'), | ||
222 | 23 | ('utopic', 'juno'), | ||
223 | 24 | ('vivid', 'kilo'), | ||
224 | 25 | ('wily', 'liberty'), | ||
225 | 26 | ('xenial', 'mitaka'), | ||
226 | 27 | ]) | ||
227 | 28 | |||
228 | 29 | |||
229 | 30 | OPENSTACK_CODENAMES = OrderedDict([ | ||
230 | 31 | ('2011.2', 'diablo'), | ||
231 | 32 | ('2012.1', 'essex'), | ||
232 | 33 | ('2012.2', 'folsom'), | ||
233 | 34 | ('2013.1', 'grizzly'), | ||
234 | 35 | ('2013.2', 'havana'), | ||
235 | 36 | ('2014.1', 'icehouse'), | ||
236 | 37 | ('2014.2', 'juno'), | ||
237 | 38 | ('2015.1', 'kilo'), | ||
238 | 39 | ('2015.2', 'liberty'), | ||
239 | 40 | ('2016.1', 'mitaka'), | ||
240 | 41 | ]) | ||
241 | 42 | |||
242 | 43 | # The ugly duckling - must list releases oldest to newest | ||
243 | 44 | SWIFT_CODENAMES = OrderedDict([ | ||
244 | 45 | ('diablo', | ||
245 | 46 | ['1.4.3']), | ||
246 | 47 | ('essex', | ||
247 | 48 | ['1.4.8']), | ||
248 | 49 | ('folsom', | ||
249 | 50 | ['1.7.4']), | ||
250 | 51 | ('grizzly', | ||
251 | 52 | ['1.7.6', '1.7.7', '1.8.0']), | ||
252 | 53 | ('havana', | ||
253 | 54 | ['1.9.0', '1.9.1', '1.10.0']), | ||
254 | 55 | ('icehouse', | ||
255 | 56 | ['1.11.0', '1.12.0', '1.13.0', '1.13.1']), | ||
256 | 57 | ('juno', | ||
257 | 58 | ['2.0.0', '2.1.0', '2.2.0']), | ||
258 | 59 | ('kilo', | ||
259 | 60 | ['2.2.1', '2.2.2']), | ||
260 | 61 | ('liberty', | ||
261 | 62 | ['2.3.0', '2.4.0', '2.5.0']), | ||
262 | 63 | ('mitaka', | ||
263 | 64 | ['2.5.0']), | ||
264 | 65 | ]) | ||
265 | 66 | |||
266 | 67 | # >= Liberty version->codename mapping | ||
267 | 68 | PACKAGE_CODENAMES = { | ||
268 | 69 | 'nova-common': OrderedDict([ | ||
269 | 70 | ('12.0', 'liberty'), | ||
270 | 71 | ('13.0', 'mitaka'), | ||
271 | 72 | ]), | ||
272 | 73 | 'neutron-common': OrderedDict([ | ||
273 | 74 | ('7.0', 'liberty'), | ||
274 | 75 | ('8.0', 'mitaka'), | ||
275 | 76 | ]), | ||
276 | 77 | 'cinder-common': OrderedDict([ | ||
277 | 78 | ('7.0', 'liberty'), | ||
278 | 79 | ('8.0', 'mitaka'), | ||
279 | 80 | ]), | ||
280 | 81 | 'keystone': OrderedDict([ | ||
281 | 82 | ('8.0', 'liberty'), | ||
282 | 83 | ('9.0', 'mitaka'), | ||
283 | 84 | ]), | ||
284 | 85 | 'horizon-common': OrderedDict([ | ||
285 | 86 | ('8.0', 'liberty'), | ||
286 | 87 | ('9.0', 'mitaka'), | ||
287 | 88 | ]), | ||
288 | 89 | 'ceilometer-common': OrderedDict([ | ||
289 | 90 | ('5.0', 'liberty'), | ||
290 | 91 | ('6.0', 'mitaka'), | ||
291 | 92 | ]), | ||
292 | 93 | 'heat-common': OrderedDict([ | ||
293 | 94 | ('5.0', 'liberty'), | ||
294 | 95 | ('6.0', 'mitaka'), | ||
295 | 96 | ]), | ||
296 | 97 | 'glance-common': OrderedDict([ | ||
297 | 98 | ('11.0', 'liberty'), | ||
298 | 99 | ('12.0', 'mitaka'), | ||
299 | 100 | ]), | ||
300 | 101 | 'openstack-dashboard': OrderedDict([ | ||
301 | 102 | ('8.0', 'liberty'), | ||
302 | 103 | ('9.0', 'mitaka'), | ||
303 | 104 | ]), | ||
304 | 105 | } | ||
305 | 0 | 106 | ||
306 | === added directory 'specs/full_stack/next_deploy/mitaka' | |||
307 | === added file 'specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt' | |||
308 | --- specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 | |||
309 | +++ specs/full_stack/next_deploy/mitaka/SPEC_INFO.txt 2016-01-21 13:19:38 +0000 | |||
310 | @@ -0,0 +1,2 @@ | |||
311 | 1 | This spec performs a non-ha deploy using the next charms and then runs tests | ||
312 | 2 | to validate the deployment | ||
313 | 0 | 3 | ||
314 | === added symlink 'specs/full_stack/next_deploy/mitaka/check_juju.py' | |||
315 | === target is u'../../../../helper/tests/check_juju.py' | |||
316 | === added symlink 'specs/full_stack/next_deploy/mitaka/collect-next-trusty' | |||
317 | === target is u'../../../../helper/collect/collect-next' | |||
318 | === added symlink 'specs/full_stack/next_deploy/mitaka/collect-next-xenial' | |||
319 | === target is u'../../../../helper/collect/collect-next-wily' | |||
320 | === added symlink 'specs/full_stack/next_deploy/mitaka/full.yaml' | |||
321 | === target is u'../../../../helper/bundles/full.yaml' | |||
322 | === added symlink 'specs/full_stack/next_deploy/mitaka/image_setup.py' | |||
323 | === target is u'../../../../helper/setup/image_setup.py' | |||
324 | === added symlink 'specs/full_stack/next_deploy/mitaka/images.yaml' | |||
325 | === target is u'../../../../helper/setup/images.yaml' | |||
326 | === added symlink 'specs/full_stack/next_deploy/mitaka/keystone_setup.py' | |||
327 | === target is u'../../../../helper/setup/keystone_setup.py' | |||
328 | === added symlink 'specs/full_stack/next_deploy/mitaka/keystone_users.yaml' | |||
329 | === target is u'../../../../helper/setup/keystone_users.yaml' | |||
330 | === added file 'specs/full_stack/next_deploy/mitaka/manifest' | |||
331 | --- specs/full_stack/next_deploy/mitaka/manifest 1970-01-01 00:00:00 +0000 | |||
332 | +++ specs/full_stack/next_deploy/mitaka/manifest 2016-01-21 13:19:38 +0000 | |||
333 | @@ -0,0 +1,22 @@ | |||
334 | 1 | # Collect the charm branches from Launchpad | ||
335 | 2 | collect config=collect-next-${MOJO_SERIES} | ||
336 | 3 | |||
337 | 4 | # Use juju deployer with full.yaml bundle | ||
338 | 5 | deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka | ||
339 | 6 | |||
340 | 7 | # Check juju statuses are green and that hooks have finished | ||
341 | 8 | verify config=check_juju.py | ||
342 | 9 | |||
343 | 10 | # Create sdn on overcloud | ||
344 | 11 | script config=network_setup.py | ||
345 | 12 | |||
346 | 13 | # Setup glance images | ||
347 | 14 | script config=image_setup.py | ||
348 | 15 | |||
349 | 16 | # Setup keystone users | ||
350 | 17 | script config=keystone_setup.py | ||
351 | 18 | |||
352 | 19 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
353 | 20 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300" | ||
354 | 21 | |||
355 | 22 | # Success | ||
356 | 0 | 23 | ||
357 | === added symlink 'specs/full_stack/next_deploy/mitaka/network.yaml' | |||
358 | === target is u'../../../../helper/setup/network.yaml' | |||
359 | === added symlink 'specs/full_stack/next_deploy/mitaka/network_setup.py' | |||
360 | === target is u'../../../../helper/setup/network_setup.py' | |||
361 | === added symlink 'specs/full_stack/next_deploy/mitaka/simple_os_checks.py' | |||
362 | === target is u'../../../../helper/tests/simple_os_checks.py' | |||
363 | === added symlink 'specs/full_stack/next_deploy/mitaka/utils' | |||
364 | === target is u'../../../../helper/utils' | |||
365 | === added directory 'specs/full_stack/next_ha_oneshot/mitaka' | |||
366 | === added file 'specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt' | |||
367 | --- specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 | |||
368 | +++ specs/full_stack/next_ha_oneshot/mitaka/SPEC_INFO.txt 2016-01-21 13:19:38 +0000 | |||
369 | @@ -0,0 +1,3 @@ | |||
370 | 1 | This spec performs a ha deploy in one shot (not phased) then runs tests to | ||
371 | 2 | validate the deployment. The assumption is that the version of juju has | ||
372 | 3 | leadership enabled. | ||
373 | 0 | 4 | ||
374 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/check_juju.py' | |||
375 | === target is u'../../../../helper/tests/check_juju.py' | |||
376 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/collect-next-ha' | |||
377 | === target is u'../../../../helper/collect/collect-next-ha' | |||
378 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/ha.yaml' | |||
379 | === target is u'../../../../helper/bundles/ha.yaml' | |||
380 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/image_setup.py' | |||
381 | === target is u'../../../../helper/setup/image_setup.py' | |||
382 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/images.yaml' | |||
383 | === target is u'../../../../helper/setup/images.yaml' | |||
384 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/keystone_setup.py' | |||
385 | === target is u'../../../../helper/setup/keystone_setup.py' | |||
386 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/keystone_users.yaml' | |||
387 | === target is u'../../../../helper/setup/keystone_users.yaml' | |||
388 | === added file 'specs/full_stack/next_ha_oneshot/mitaka/manifest' | |||
389 | --- specs/full_stack/next_ha_oneshot/mitaka/manifest 1970-01-01 00:00:00 +0000 | |||
390 | +++ specs/full_stack/next_ha_oneshot/mitaka/manifest 2016-01-21 13:19:38 +0000 | |||
391 | @@ -0,0 +1,31 @@ | |||
392 | 1 | # Collect the charm branches from Launchpad | ||
393 | 2 | collect config=collect-next-ha | ||
394 | 3 | |||
395 | 4 | # Use juju deployer to create the units for the deployment | ||
396 | 5 | deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka-ha | ||
397 | 6 | |||
398 | 7 | # Check juju statuses are green and that hooks have finished | ||
399 | 8 | verify config=check_juju.py | ||
400 | 9 | |||
401 | 10 | # Examine the available networks and set vips for services need updates to support this | ||
402 | 11 | #script config=set_vips.py | ||
403 | 12 | |||
404 | 13 | # Check juju statuses are green and that hooks have finished | ||
405 | 14 | verify config=check_juju.py | ||
406 | 15 | |||
407 | 16 | # Create sdn on overcloud | ||
408 | 17 | script config=network_setup.py | ||
409 | 18 | |||
410 | 19 | # Setup glance images | ||
411 | 20 | script config=image_setup.py | ||
412 | 21 | |||
413 | 22 | # Setup keystone users | ||
414 | 23 | script config=keystone_setup.py | ||
415 | 24 | |||
416 | 25 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
417 | 26 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300" | ||
418 | 27 | |||
419 | 28 | # Test obj store by sending and recieving files | ||
420 | 29 | verify config=test_obj_store.py | ||
421 | 30 | |||
422 | 31 | # Success | ||
423 | 0 | 32 | ||
424 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/network.yaml' | |||
425 | === target is u'../../../../helper/setup/network.yaml' | |||
426 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/network_setup.py' | |||
427 | === target is u'../../../../helper/setup/network_setup.py' | |||
428 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/set_vips.py' | |||
429 | === target is u'../../../../helper/setup/set_vips.py' | |||
430 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/simple_os_checks.py' | |||
431 | === target is u'../../../../helper/tests/simple_os_checks.py' | |||
432 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/test_obj_store.py' | |||
433 | === target is u'../../../../helper/tests/test_obj_store.py' | |||
434 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/utils' | |||
435 | === target is u'../../../../helper/utils' | |||
436 | === added directory 'specs/full_stack/next_openstack_upgrade/liberty' | |||
437 | === added file 'specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt' | |||
438 | --- specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 | |||
439 | +++ specs/full_stack/next_openstack_upgrade/liberty/SPEC_INFO.txt 2016-01-21 13:19:38 +0000 | |||
440 | @@ -0,0 +1,2 @@ | |||
441 | 1 | This spec performs a non-ha deploy using the next charms and then upgrades | ||
442 | 2 | to the next version of openstack | ||
443 | 0 | 3 | ||
444 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/check_juju.py' | |||
445 | === target is u'../../../../helper/tests/check_juju.py' | |||
446 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/collect-next-trusty' | |||
447 | === target is u'../../../../helper/collect/collect-next' | |||
448 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/collect-next-wily' | |||
449 | === target is u'../../../../helper/collect/collect-next' | |||
450 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/full.yaml' | |||
451 | === target is u'../../../../helper/bundles/full.yaml' | |||
452 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/image_setup.py' | |||
453 | === target is u'../../../../helper/setup/image_setup.py' | |||
454 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/images.yaml' | |||
455 | === target is u'../../../../helper/setup/images.yaml' | |||
456 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/keystone_setup.py' | |||
457 | === target is u'../../../../helper/setup/keystone_setup.py' | |||
458 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/keystone_users.yaml' | |||
459 | === target is u'../../../../helper/setup/keystone_users.yaml' | |||
460 | === added file 'specs/full_stack/next_openstack_upgrade/liberty/manifest' | |||
461 | --- specs/full_stack/next_openstack_upgrade/liberty/manifest 1970-01-01 00:00:00 +0000 | |||
462 | +++ specs/full_stack/next_openstack_upgrade/liberty/manifest 2016-01-21 13:19:38 +0000 | |||
463 | @@ -0,0 +1,28 @@ | |||
464 | 1 | # Collect the charm branches from Launchpad | ||
465 | 2 | collect config=collect-next-${MOJO_SERIES} | ||
466 | 3 | |||
467 | 4 | # Use juju deployer with full.yaml bundle | ||
468 | 5 | deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty | ||
469 | 6 | |||
470 | 7 | # Check juju statuses are green and that hooks have finished | ||
471 | 8 | verify config=check_juju.py | ||
472 | 9 | |||
473 | 10 | # Create sdn on overcloud | ||
474 | 11 | script config=network_setup.py | ||
475 | 12 | |||
476 | 13 | # Setup glance images | ||
477 | 14 | script config=image_setup.py | ||
478 | 15 | |||
479 | 16 | # Setup keystone users | ||
480 | 17 | script config=keystone_setup.py | ||
481 | 18 | |||
482 | 19 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
483 | 20 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300" | ||
484 | 21 | |||
485 | 22 | # Upgrade Openstack | ||
486 | 23 | script config=upgrade_openstack.py | ||
487 | 24 | |||
488 | 25 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
489 | 26 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300" | ||
490 | 27 | |||
491 | 28 | # Success | ||
492 | 0 | 29 | ||
493 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/network.yaml' | |||
494 | === target is u'../../../../helper/setup/network.yaml' | |||
495 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/network_setup.py' | |||
496 | === target is u'../../../../helper/setup/network_setup.py' | |||
497 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/simple_os_checks.py' | |||
498 | === target is u'../../../../helper/tests/simple_os_checks.py' | |||
499 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/upgrade_openstack.py' | |||
500 | === target is u'../../../../helper/setup/upgrade_openstack.py' | |||
501 | === added symlink 'specs/full_stack/next_openstack_upgrade/liberty/utils' | |||
502 | === target is u'../../../../helper/utils' |
charm_lint_check #17854 mojo-openstack- specs for gnuoy mp283441
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/17854/