Merge lp:~thedac/openstack-mojo-specs/17.02-stable-to-next into lp:openstack-mojo-specs
- 17.02-stable-to-next
- Merge into mojo-openstack-specs
Proposed by
David Ames
Status: | Merged |
---|---|
Merged at revision: | 299 |
Proposed branch: | lp:~thedac/openstack-mojo-specs/17.02-stable-to-next |
Merge into: | lp:openstack-mojo-specs |
Diff against target: |
274 lines (+124/-8) 7 files modified
helper/bundles/ha.yaml (+10/-3) helper/collect/collect-stable-ha (+22/-0) specs/full_stack/stable_to_next_ha/liberty/manifest (+2/-5) specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt (+2/-0) specs/full_stack/stable_to_next_ha/mitaka/manifest (+43/-0) specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt (+2/-0) specs/full_stack/stable_to_next_ha/newton/manifest (+43/-0) |
To merge this branch: | bzr merge lp:~thedac/openstack-mojo-specs/17.02-stable-to-next |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Needs Fixing | ||
Review via email: mp+317879@code.launchpad.net |
Commit message
Description of the change
17.02 Release changes for Stable to Next
To post a comment you must log in.
- 300. By David Ames
-
Lint fixes
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'helper/bundles/ha.yaml' | |||
2 | --- helper/bundles/ha.yaml 2017-02-10 11:39:34 +0000 | |||
3 | +++ helper/bundles/ha.yaml 2017-02-21 18:47:55 +0000 | |||
4 | @@ -70,7 +70,6 @@ | |||
5 | 70 | num_units: 3 | 70 | num_units: 3 |
6 | 71 | options: | 71 | options: |
7 | 72 | network-manager: Neutron | 72 | network-manager: Neutron |
8 | 73 | quantum-security-groups: "yes" | ||
9 | 74 | vip: 10.5.100.4 | 73 | vip: 10.5.100.4 |
10 | 75 | nova-cc-hacluster: | 74 | nova-cc-hacluster: |
11 | 76 | charm: hacluster | 75 | charm: hacluster |
12 | @@ -82,6 +81,7 @@ | |||
13 | 82 | constraints: mem=4G | 81 | constraints: mem=4G |
14 | 83 | options: | 82 | options: |
15 | 84 | instance-mtu: 1300 | 83 | instance-mtu: 1300 |
16 | 84 | bridge-mappings: physnet1:br-ex | ||
17 | 85 | cinder: | 85 | cinder: |
18 | 86 | charm: cinder | 86 | charm: cinder |
19 | 87 | constraints: mem=1G | 87 | constraints: mem=1G |
20 | @@ -272,12 +272,19 @@ | |||
21 | 272 | source: proposed | 272 | source: proposed |
22 | 273 | openstack-origin: distro-proposed | 273 | openstack-origin: distro-proposed |
23 | 274 | # ocata | 274 | # ocata |
25 | 275 | xenial-ocata: | 275 | xenial-newton-ha: |
26 | 276 | inherits: openstack-services | ||
27 | 277 | series: xenial | ||
28 | 278 | overrides: | ||
29 | 279 | openstack-origin: cloud:xenial-newton | ||
30 | 280 | source: cloud:xenial-newton | ||
31 | 281 | # ocata | ||
32 | 282 | xenial-ocata-ha: | ||
33 | 276 | inherits: openstack-services | 283 | inherits: openstack-services |
34 | 277 | series: xenial | 284 | series: xenial |
35 | 278 | overrides: | 285 | overrides: |
36 | 279 | openstack-origin: cloud:xenial-ocata | 286 | openstack-origin: cloud:xenial-ocata |
37 | 280 | source: cloud:xenial-ocata | 287 | source: cloud:xenial-ocata |
39 | 281 | zesty-ocata: | 288 | zesty-ocata-ha: |
40 | 282 | inherits: openstack-services | 289 | inherits: openstack-services |
41 | 283 | series: zesty | 290 | series: zesty |
42 | 284 | 291 | ||
43 | === added file 'helper/collect/collect-stable-ha' | |||
44 | --- helper/collect/collect-stable-ha 1970-01-01 00:00:00 +0000 | |||
45 | +++ helper/collect/collect-stable-ha 2017-02-21 18:47:55 +0000 | |||
46 | @@ -0,0 +1,22 @@ | |||
47 | 1 | ceilometer-agent cs:~openstack-charmers/ceilometer-agent | ||
48 | 2 | ceilometer cs:~openstack-charmers/ceilometer | ||
49 | 3 | ceph cs:~openstack-charmers/ceph | ||
50 | 4 | ceph-osd cs:~openstack-charmers/ceph-osd | ||
51 | 5 | cinder-ceph cs:~openstack-charmers/cinder-ceph | ||
52 | 6 | cinder cs:~openstack-charmers/cinder | ||
53 | 7 | glance cs:~openstack-charmers/glance | ||
54 | 8 | hacluster cs:~openstack-charmers/hacluster | ||
55 | 9 | heat cs:~openstack-charmers/heat | ||
56 | 10 | keystone cs:~openstack-charmers/keystone | ||
57 | 11 | mongodb cs:trusty/mongodb | ||
58 | 12 | neutron-api cs:~openstack-charmers/neutron-api | ||
59 | 13 | neutron-gateway cs:~openstack-charmers/neutron-gateway | ||
60 | 14 | neutron-openvswitch cs:~openstack-charmers/neutron-openvswitch | ||
61 | 15 | nova-cloud-controller cs:~openstack-charmers/nova-cloud-controller | ||
62 | 16 | nova-compute cs:~openstack-charmers/nova-compute | ||
63 | 17 | ntp cs:trusty/ntp | ||
64 | 18 | openstack-dashboard cs:~openstack-charmers/openstack-dashboard | ||
65 | 19 | percona-cluster cs:~openstack-charmers/percona-cluster | ||
66 | 20 | rabbitmq-server cs:~openstack-charmers/rabbitmq-server | ||
67 | 21 | swift-proxy cs:~openstack-charmers/swift-proxy | ||
68 | 22 | swift-storage cs:~openstack-charmers/swift-storage | ||
69 | 0 | 23 | ||
70 | === added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha' | |||
71 | === target is u'../../../../helper/collect/collect-next-ha' | |||
72 | === removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha-trusty' | |||
73 | === target was u'../../../../helper/collect/collect-next-ha' | |||
74 | === added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha' | |||
75 | === target is u'../../../../helper/collect/collect-stable-ha' | |||
76 | === removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha-trusty' | |||
77 | === target was u'../../../../helper/collect/collect-stable-ha-trusty' | |||
78 | === removed symlink 'specs/full_stack/stable_to_next_ha/liberty/git_checkout_stable.py' | |||
79 | === target was u'../../../../helper/setup/git_checkout_stable.py' | |||
80 | === modified file 'specs/full_stack/stable_to_next_ha/liberty/manifest' | |||
81 | --- specs/full_stack/stable_to_next_ha/liberty/manifest 2016-04-15 19:17:00 +0000 | |||
82 | +++ specs/full_stack/stable_to_next_ha/liberty/manifest 2017-02-21 18:47:55 +0000 | |||
83 | @@ -1,8 +1,5 @@ | |||
84 | 1 | # Collect the charm branches from Launchpad | 1 | # Collect the charm branches from Launchpad |
89 | 2 | collect config=collect-stable-ha-${MOJO_SERIES} | 2 | collect config=collect-stable-ha |
86 | 3 | |||
87 | 4 | # Checkout stable | ||
88 | 5 | script config=git_checkout_stable.py | ||
90 | 6 | 3 | ||
91 | 7 | # Use juju deployer to add the relations for the deployment | 4 | # Use juju deployer to add the relations for the deployment |
92 | 8 | deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha | 5 | deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha |
93 | @@ -29,7 +26,7 @@ | |||
94 | 29 | script config=wipe_charm_dir.py | 26 | script config=wipe_charm_dir.py |
95 | 30 | 27 | ||
96 | 31 | # Collect the next (devel) charm branches from Launchpad | 28 | # Collect the next (devel) charm branches from Launchpad |
98 | 32 | collect config=collect-next-ha-${MOJO_SERIES} | 29 | collect config=collect-next-ha |
99 | 33 | 30 | ||
100 | 34 | # Run upgrade-charm on all services | 31 | # Run upgrade-charm on all services |
101 | 35 | script config=upgrade_all_services.py | 32 | script config=upgrade_all_services.py |
102 | 36 | 33 | ||
103 | === added directory 'specs/full_stack/stable_to_next_ha/mitaka' | |||
104 | === added file 'specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt' | |||
105 | --- specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 | |||
106 | +++ specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt 2017-02-21 18:47:55 +0000 | |||
107 | @@ -0,0 +1,2 @@ | |||
108 | 1 | This spec performs a phased ha deploy using the stable charms then upgrades | ||
109 | 2 | charms to the next branches then runs tests to validate the deployment | ||
110 | 0 | 3 | ||
111 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/check_juju.py' | |||
112 | === target is u'../../../../helper/tests/check_juju.py' | |||
113 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-next-ha' | |||
114 | === target is u'../../../../helper/collect/collect-next-ha' | |||
115 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-stable-ha' | |||
116 | === target is u'../../../../helper/collect/collect-stable-ha' | |||
117 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/ha.yaml' | |||
118 | === target is u'../../../../helper/bundles/ha.yaml' | |||
119 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/image_setup.py' | |||
120 | === target is u'../../../../helper/setup/image_setup.py' | |||
121 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/images.yaml' | |||
122 | === target is u'../../../../helper/setup/images.yaml' | |||
123 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_setup.py' | |||
124 | === target is u'../../../../helper/setup/keystone_setup.py' | |||
125 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_users.yaml' | |||
126 | === target is u'../../../../helper/setup/keystone_users.yaml' | |||
127 | === added file 'specs/full_stack/stable_to_next_ha/mitaka/manifest' | |||
128 | --- specs/full_stack/stable_to_next_ha/mitaka/manifest 1970-01-01 00:00:00 +0000 | |||
129 | +++ specs/full_stack/stable_to_next_ha/mitaka/manifest 2017-02-21 18:47:55 +0000 | |||
130 | @@ -0,0 +1,43 @@ | |||
131 | 1 | # Collect the charm branches from Launchpad | ||
132 | 2 | collect config=collect-stable-ha | ||
133 | 3 | |||
134 | 4 | # Use juju deployer to add the relations for the deployment | ||
135 | 5 | deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka-ha | ||
136 | 6 | |||
137 | 7 | # Check juju statuses are green and that hooks have finished | ||
138 | 8 | #verify config=check_juju.py | ||
139 | 9 | |||
140 | 10 | # Create sdn on overcloud | ||
141 | 11 | script config=network_setup.py | ||
142 | 12 | |||
143 | 13 | # Setup glance images | ||
144 | 14 | script config=image_setup.py | ||
145 | 15 | |||
146 | 16 | # Setup keystone users | ||
147 | 17 | script config=keystone_setup.py | ||
148 | 18 | |||
149 | 19 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
150 | 20 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300" | ||
151 | 21 | |||
152 | 22 | # Test obj store by sending and recieving files | ||
153 | 23 | verify config=test_obj_store.py | ||
154 | 24 | |||
155 | 25 | # Remove charms directories | ||
156 | 26 | script config=wipe_charm_dir.py | ||
157 | 27 | |||
158 | 28 | # Collect the next (devel) charm branches from Launchpad | ||
159 | 29 | collect config=collect-next-ha | ||
160 | 30 | |||
161 | 31 | # Run upgrade-charm on all services | ||
162 | 32 | script config=upgrade_all_services.py | ||
163 | 33 | |||
164 | 34 | # Check juju statuses are green and that hooks have finished | ||
165 | 35 | verify config=check_juju.py | ||
166 | 36 | |||
167 | 37 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
168 | 38 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300" | ||
169 | 39 | |||
170 | 40 | # Test obj store by sending and recieving files | ||
171 | 41 | verify config=test_obj_store.py | ||
172 | 42 | |||
173 | 43 | # Success | ||
174 | 0 | 44 | ||
175 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network.yaml' | |||
176 | === target is u'../../../../helper/setup/network.yaml' | |||
177 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network_setup.py' | |||
178 | === target is u'../../../../helper/setup/network_setup.py' | |||
179 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/simple_os_checks.py' | |||
180 | === target is u'../../../../helper/tests/simple_os_checks.py' | |||
181 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/test_obj_store.py' | |||
182 | === target is u'../../../../helper/tests/test_obj_store.py' | |||
183 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/upgrade_all_services.py' | |||
184 | === target is u'../../../../helper/setup/upgrade_all_services.py' | |||
185 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/utils' | |||
186 | === target is u'../../../../helper/utils' | |||
187 | === added symlink 'specs/full_stack/stable_to_next_ha/mitaka/wipe_charm_dir.py' | |||
188 | === target is u'../../../../helper/setup/wipe_charm_dir.py' | |||
189 | === added directory 'specs/full_stack/stable_to_next_ha/newton' | |||
190 | === added file 'specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt' | |||
191 | --- specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt 1970-01-01 00:00:00 +0000 | |||
192 | +++ specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt 2017-02-21 18:47:55 +0000 | |||
193 | @@ -0,0 +1,2 @@ | |||
194 | 1 | This spec performs a phased ha deploy using the stable charms then upgrades | ||
195 | 2 | charms to the next branches then runs tests to validate the deployment | ||
196 | 0 | 3 | ||
197 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/check_juju.py' | |||
198 | === target is u'../../../../helper/tests/check_juju.py' | |||
199 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-next-ha' | |||
200 | === target is u'../../../../helper/collect/collect-next-ha' | |||
201 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-stable-ha' | |||
202 | === target is u'../../../../helper/collect/collect-stable-ha' | |||
203 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/ha.yaml' | |||
204 | === target is u'../../../../helper/bundles/ha.yaml' | |||
205 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/image_setup.py' | |||
206 | === target is u'../../../../helper/setup/image_setup.py' | |||
207 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/images.yaml' | |||
208 | === target is u'../../../../helper/setup/images.yaml' | |||
209 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_setup.py' | |||
210 | === target is u'../../../../helper/setup/keystone_setup.py' | |||
211 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_users.yaml' | |||
212 | === target is u'../../../../helper/setup/keystone_users.yaml' | |||
213 | === added file 'specs/full_stack/stable_to_next_ha/newton/manifest' | |||
214 | --- specs/full_stack/stable_to_next_ha/newton/manifest 1970-01-01 00:00:00 +0000 | |||
215 | +++ specs/full_stack/stable_to_next_ha/newton/manifest 2017-02-21 18:47:55 +0000 | |||
216 | @@ -0,0 +1,43 @@ | |||
217 | 1 | # Collect the charm branches from Launchpad | ||
218 | 2 | collect config=collect-stable-ha | ||
219 | 3 | |||
220 | 4 | # Use juju deployer to add the relations for the deployment | ||
221 | 5 | deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-newton-ha | ||
222 | 6 | |||
223 | 7 | # Check juju statuses are green and that hooks have finished | ||
224 | 8 | #verify config=check_juju.py | ||
225 | 9 | |||
226 | 10 | # Create sdn on overcloud | ||
227 | 11 | script config=network_setup.py | ||
228 | 12 | |||
229 | 13 | # Setup glance images | ||
230 | 14 | script config=image_setup.py | ||
231 | 15 | |||
232 | 16 | # Setup keystone users | ||
233 | 17 | script config=keystone_setup.py | ||
234 | 18 | |||
235 | 19 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
236 | 20 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300" | ||
237 | 21 | |||
238 | 22 | # Test obj store by sending and recieving files | ||
239 | 23 | verify config=test_obj_store.py | ||
240 | 24 | |||
241 | 25 | # Remove charms directories | ||
242 | 26 | script config=wipe_charm_dir.py | ||
243 | 27 | |||
244 | 28 | # Collect the next (devel) charm branches from Launchpad | ||
245 | 29 | collect config=collect-next-ha | ||
246 | 30 | |||
247 | 31 | # Run upgrade-charm on all services | ||
248 | 32 | script config=upgrade_all_services.py | ||
249 | 33 | |||
250 | 34 | # Check juju statuses are green and that hooks have finished | ||
251 | 35 | verify config=check_juju.py | ||
252 | 36 | |||
253 | 37 | # Create 1 * tiny cirros and 1 * small precise instances on the overcloud | ||
254 | 38 | verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300" | ||
255 | 39 | |||
256 | 40 | # Test obj store by sending and recieving files | ||
257 | 41 | verify config=test_obj_store.py | ||
258 | 42 | |||
259 | 43 | # Success | ||
260 | 0 | 44 | ||
261 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/network.yaml' | |||
262 | === target is u'../../../../helper/setup/network.yaml' | |||
263 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/network_setup.py' | |||
264 | === target is u'../../../../helper/setup/network_setup.py' | |||
265 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/simple_os_checks.py' | |||
266 | === target is u'../../../../helper/tests/simple_os_checks.py' | |||
267 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/test_obj_store.py' | |||
268 | === target is u'../../../../helper/tests/test_obj_store.py' | |||
269 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/upgrade_all_services.py' | |||
270 | === target is u'../../../../helper/setup/upgrade_all_services.py' | |||
271 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/utils' | |||
272 | === target is u'../../../../helper/utils' | |||
273 | === added symlink 'specs/full_stack/stable_to_next_ha/newton/wipe_charm_dir.py' | |||
274 | === target is u'../../../../helper/setup/wipe_charm_dir.py' |
Please `make lint`:
(!) specs/full_ stack/stable_ to_next_ ha/mitaka root:git_ checkout_ stable. py is not referenced by the manifest. Can this file be removed?
WARNING:
(!) specs/full_ stack/stable_ to_next_ ha/liberty root:collect- next-ha- trusty is not referenced by the manifest. Can this file be removed? root:collect- stable- ha-trusty is not referenced by the manifest. Can this file be removed?
WARNING:
WARNING:
(!) specs/full_ stack/stable_ to_next_ ha/newton root:git_ checkout_ stable. py is not referenced by the manifest. Can this file be removed?
WARNING: