Browse Source

Updates for pike b1

Resync charmhelpers for pike version support.

Add pike tests but leave disabled until all charms support pike.

Change-Id: I2b0ba853512f0e1f982ac02dd52c8be5796b8383
changes/29/464129/1
James Page 2 years ago
parent
commit
f4e10e0af0

+ 5
- 1
hooks/charmhelpers/contrib/openstack/amulet/deployment.py View File

@@ -262,7 +262,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
262 262
         # Must be ordered by OpenStack release (not by Ubuntu release):
263 263
         (self.trusty_icehouse, self.trusty_kilo, self.trusty_liberty,
264 264
          self.trusty_mitaka, self.xenial_mitaka, self.xenial_newton,
265
-         self.yakkety_newton, self.xenial_ocata, self.zesty_ocata) = range(9)
265
+         self.yakkety_newton, self.xenial_ocata, self.zesty_ocata,
266
+         self.xenial_pike, self.artful_pike) = range(11)
266 267
 
267 268
         releases = {
268 269
             ('trusty', None): self.trusty_icehouse,
@@ -272,8 +273,10 @@ class OpenStackAmuletDeployment(AmuletDeployment):
272 273
             ('xenial', None): self.xenial_mitaka,
273 274
             ('xenial', 'cloud:xenial-newton'): self.xenial_newton,
274 275
             ('xenial', 'cloud:xenial-ocata'): self.xenial_ocata,
276
+            ('xenial', 'cloud:xenial-pike'): self.xenial_pike,
275 277
             ('yakkety', None): self.yakkety_newton,
276 278
             ('zesty', None): self.zesty_ocata,
279
+            ('artful', None): self.artful_pike,
277 280
         }
278 281
         return releases[(self.series, self.openstack)]
279 282
 
@@ -287,6 +290,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
287 290
             ('xenial', 'mitaka'),
288 291
             ('yakkety', 'newton'),
289 292
             ('zesty', 'ocata'),
293
+            ('artful', 'pike'),
290 294
         ])
291 295
         if self.openstack:
292 296
             os_origin = self.openstack.split(':')[1]

+ 4
- 0
hooks/charmhelpers/contrib/openstack/context.py View File

@@ -1393,6 +1393,10 @@ class NeutronAPIContext(OSContextGenerator):
1393 1393
                 'rel_key': 'enable-l3ha',
1394 1394
                 'default': False,
1395 1395
             },
1396
+            'dns_domain': {
1397
+                'rel_key': 'dns-domain',
1398
+                'default': None,
1399
+            },
1396 1400
         }
1397 1401
         ctxt = self.get_neutron_options({})
1398 1402
         for rid in relation_ids('neutron-plugin-api'):

+ 39
- 0
hooks/charmhelpers/contrib/openstack/utils.py View File

@@ -111,6 +111,8 @@ OPENSTACK_RELEASES = (
111 111
     'newton',
112 112
     'ocata',
113 113
     'pike',
114
+    'queens',
115
+    'rocky',
114 116
 )
115 117
 
116 118
 UBUNTU_OPENSTACK_RELEASE = OrderedDict([
@@ -126,6 +128,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
126 128
     ('xenial', 'mitaka'),
127 129
     ('yakkety', 'newton'),
128 130
     ('zesty', 'ocata'),
131
+    ('artful', 'pike'),
129 132
 ])
130 133
 
131 134
 
@@ -142,6 +145,7 @@ OPENSTACK_CODENAMES = OrderedDict([
142 145
     ('2016.1', 'mitaka'),
143 146
     ('2016.2', 'newton'),
144 147
     ('2017.1', 'ocata'),
148
+    ('2017.2', 'pike'),
145 149
 ])
146 150
 
147 151
 # The ugly duckling - must list releases oldest to newest
@@ -170,6 +174,8 @@ SWIFT_CODENAMES = OrderedDict([
170 174
         ['2.8.0', '2.9.0', '2.10.0']),
171 175
     ('ocata',
172 176
         ['2.11.0', '2.12.0', '2.13.0']),
177
+    ('pike',
178
+        ['2.13.0']),
173 179
 ])
174 180
 
175 181
 # >= Liberty version->codename mapping
@@ -179,54 +185,81 @@ PACKAGE_CODENAMES = {
179 185
         ('13', 'mitaka'),
180 186
         ('14', 'newton'),
181 187
         ('15', 'ocata'),
188
+        ('16', 'pike'),
189
+        ('17', 'queens'),
190
+        ('18', 'rocky'),
182 191
     ]),
183 192
     'neutron-common': OrderedDict([
184 193
         ('7', 'liberty'),
185 194
         ('8', 'mitaka'),
186 195
         ('9', 'newton'),
187 196
         ('10', 'ocata'),
197
+        ('11', 'pike'),
198
+        ('12', 'queens'),
199
+        ('13', 'rocky'),
188 200
     ]),
189 201
     'cinder-common': OrderedDict([
190 202
         ('7', 'liberty'),
191 203
         ('8', 'mitaka'),
192 204
         ('9', 'newton'),
193 205
         ('10', 'ocata'),
206
+        ('11', 'pike'),
207
+        ('12', 'queens'),
208
+        ('13', 'rocky'),
194 209
     ]),
195 210
     'keystone': OrderedDict([
196 211
         ('8', 'liberty'),
197 212
         ('9', 'mitaka'),
198 213
         ('10', 'newton'),
199 214
         ('11', 'ocata'),
215
+        ('12', 'pike'),
216
+        ('13', 'queens'),
217
+        ('14', 'rocky'),
200 218
     ]),
201 219
     'horizon-common': OrderedDict([
202 220
         ('8', 'liberty'),
203 221
         ('9', 'mitaka'),
204 222
         ('10', 'newton'),
205 223
         ('11', 'ocata'),
224
+        ('12', 'pike'),
225
+        ('13', 'queens'),
226
+        ('14', 'rocky'),
206 227
     ]),
207 228
     'ceilometer-common': OrderedDict([
208 229
         ('5', 'liberty'),
209 230
         ('6', 'mitaka'),
210 231
         ('7', 'newton'),
211 232
         ('8', 'ocata'),
233
+        ('9', 'pike'),
234
+        ('10', 'queens'),
235
+        ('11', 'rocky'),
212 236
     ]),
213 237
     'heat-common': OrderedDict([
214 238
         ('5', 'liberty'),
215 239
         ('6', 'mitaka'),
216 240
         ('7', 'newton'),
217 241
         ('8', 'ocata'),
242
+        ('9', 'pike'),
243
+        ('10', 'queens'),
244
+        ('11', 'rocky'),
218 245
     ]),
219 246
     'glance-common': OrderedDict([
220 247
         ('11', 'liberty'),
221 248
         ('12', 'mitaka'),
222 249
         ('13', 'newton'),
223 250
         ('14', 'ocata'),
251
+        ('15', 'pike'),
252
+        ('16', 'queens'),
253
+        ('17', 'rocky'),
224 254
     ]),
225 255
     'openstack-dashboard': OrderedDict([
226 256
         ('8', 'liberty'),
227 257
         ('9', 'mitaka'),
228 258
         ('10', 'newton'),
229 259
         ('11', 'ocata'),
260
+        ('12', 'pike'),
261
+        ('13', 'queens'),
262
+        ('14', 'rocky'),
230 263
     ]),
231 264
 }
232 265
 
@@ -579,6 +612,12 @@ def configure_installation_source(rel):
579 612
             'ocata': 'xenial-updates/ocata',
580 613
             'ocata/updates': 'xenial-updates/ocata',
581 614
             'ocata/proposed': 'xenial-proposed/ocata',
615
+            'pike': 'xenial-updates/pike',
616
+            'pike/updates': 'xenial-updates/pike',
617
+            'pike/proposed': 'xenial-proposed/pike',
618
+            'queens': 'xenial-updates/queens',
619
+            'queens/updates': 'xenial-updates/queens',
620
+            'queens/proposed': 'xenial-proposed/queens',
582 621
         }
583 622
 
584 623
         try:

+ 1
- 0
hooks/charmhelpers/core/host_factory/ubuntu.py View File

@@ -19,6 +19,7 @@ UBUNTU_RELEASES = (
19 19
     'xenial',
20 20
     'yakkety',
21 21
     'zesty',
22
+    'artful',
22 23
 )
23 24
 
24 25
 

+ 16
- 0
hooks/charmhelpers/fetch/ubuntu.py View File

@@ -113,6 +113,22 @@ CLOUD_ARCHIVE_POCKETS = {
113 113
     'ocata/proposed': 'xenial-proposed/ocata',
114 114
     'xenial-ocata/proposed': 'xenial-proposed/ocata',
115 115
     'xenial-ocata/newton': 'xenial-proposed/ocata',
116
+    # Pike
117
+    'pike': 'xenial-updates/pike',
118
+    'xenial-pike': 'xenial-updates/pike',
119
+    'xenial-pike/updates': 'xenial-updates/pike',
120
+    'xenial-updates/pike': 'xenial-updates/pike',
121
+    'pike/proposed': 'xenial-proposed/pike',
122
+    'xenial-pike/proposed': 'xenial-proposed/pike',
123
+    'xenial-pike/newton': 'xenial-proposed/pike',
124
+    # Queens
125
+    'queens': 'xenial-updates/queens',
126
+    'xenial-queens': 'xenial-updates/queens',
127
+    'xenial-queens/updates': 'xenial-updates/queens',
128
+    'xenial-updates/queens': 'xenial-updates/queens',
129
+    'queens/proposed': 'xenial-proposed/queens',
130
+    'xenial-queens/proposed': 'xenial-proposed/queens',
131
+    'xenial-queens/newton': 'xenial-proposed/queens',
116 132
 }
117 133
 
118 134
 APT_NO_LOCK = 100  # The return code for "couldn't acquire lock" in APT.

+ 5
- 1
tests/charmhelpers/contrib/openstack/amulet/deployment.py View File

@@ -262,7 +262,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
262 262
         # Must be ordered by OpenStack release (not by Ubuntu release):
263 263
         (self.trusty_icehouse, self.trusty_kilo, self.trusty_liberty,
264 264
          self.trusty_mitaka, self.xenial_mitaka, self.xenial_newton,
265
-         self.yakkety_newton, self.xenial_ocata, self.zesty_ocata) = range(9)
265
+         self.yakkety_newton, self.xenial_ocata, self.zesty_ocata,
266
+         self.xenial_pike, self.artful_pike) = range(11)
266 267
 
267 268
         releases = {
268 269
             ('trusty', None): self.trusty_icehouse,
@@ -272,8 +273,10 @@ class OpenStackAmuletDeployment(AmuletDeployment):
272 273
             ('xenial', None): self.xenial_mitaka,
273 274
             ('xenial', 'cloud:xenial-newton'): self.xenial_newton,
274 275
             ('xenial', 'cloud:xenial-ocata'): self.xenial_ocata,
276
+            ('xenial', 'cloud:xenial-pike'): self.xenial_pike,
275 277
             ('yakkety', None): self.yakkety_newton,
276 278
             ('zesty', None): self.zesty_ocata,
279
+            ('artful', None): self.artful_pike,
277 280
         }
278 281
         return releases[(self.series, self.openstack)]
279 282
 
@@ -287,6 +290,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
287 290
             ('xenial', 'mitaka'),
288 291
             ('yakkety', 'newton'),
289 292
             ('zesty', 'ocata'),
293
+            ('artful', 'pike'),
290 294
         ])
291 295
         if self.openstack:
292 296
             os_origin = self.openstack.split(':')[1]

+ 1
- 0
tests/charmhelpers/core/host_factory/ubuntu.py View File

@@ -19,6 +19,7 @@ UBUNTU_RELEASES = (
19 19
     'xenial',
20 20
     'yakkety',
21 21
     'zesty',
22
+    'artful',
22 23
 )
23 24
 
24 25
 

+ 23
- 0
tests/gate-basic-artful-pike View File

@@ -0,0 +1,23 @@
1
+#!/usr/bin/env python
2
+#
3
+# Copyright 2016 Canonical Ltd
4
+#
5
+# Licensed under the Apache License, Version 2.0 (the "License");
6
+# you may not use this file except in compliance with the License.
7
+# You may obtain a copy of the License at
8
+#
9
+#  http://www.apache.org/licenses/LICENSE-2.0
10
+#
11
+# Unless required by applicable law or agreed to in writing, software
12
+# distributed under the License is distributed on an "AS IS" BASIS,
13
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+# See the License for the specific language governing permissions and
15
+# limitations under the License.
16
+
17
+"""Amulet tests on a basic cinder-backup deployment on artful-pike."""
18
+
19
+from basic_deployment import CinderBackupBasicDeployment
20
+
21
+if __name__ == '__main__':
22
+    deployment = CinderBackupBasicDeployment(series='artful')
23
+    deployment.run_tests()

+ 25
- 0
tests/gate-basic-xenial-pike View File

@@ -0,0 +1,25 @@
1
+#!/usr/bin/env python
2
+#
3
+# Copyright 2016 Canonical Ltd
4
+#
5
+# Licensed under the Apache License, Version 2.0 (the "License");
6
+# you may not use this file except in compliance with the License.
7
+# You may obtain a copy of the License at
8
+#
9
+#  http://www.apache.org/licenses/LICENSE-2.0
10
+#
11
+# Unless required by applicable law or agreed to in writing, software
12
+# distributed under the License is distributed on an "AS IS" BASIS,
13
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+# See the License for the specific language governing permissions and
15
+# limitations under the License.
16
+
17
+"""Amulet tests on a basic cinder backup deployment on xenial-pike."""
18
+
19
+from basic_deployment import CinderBackupBasicDeployment
20
+
21
+if __name__ == '__main__':
22
+    deployment = CinderBackupBasicDeployment(series='xenial',
23
+                                             openstack='cloud:xenial-pike',
24
+                                             source='cloud:xenial-updates/pike')
25
+    deployment.run_tests()

Loading…
Cancel
Save