zuul/nodepool
Code Issues Proposed changes

Fix openstack image deletion with newer sdk

Browse Source 
Openstacksdk version 0.103.0 removed an informal API we were using
which accepted an abbreviated dictionary as input to the delete_image
method.

It now requires either a complete image object or just a name_or_id,
so we now pass in the id.

The sdk min version is increased since older versions have not been
tested with this.

Change-Id: I7df276ab76e9b8fc17612853b474fec414dae977
This commit is contained in:
James E. Blair 2022-12-13 15:47:09 -08:00
parent 9d98386b62
commit f7ed1eb1ea
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/driver/openstack/provider.py
View File

@ -220,7 +220,7 @@ class OpenStackProvider(Provider, QuotaSupport):
if name in self._images: if name in self._images:
del self._images[name] del self._images[name]
return self._client.delete_image(dict(id=id)) return self._client.delete_image(id)
def createServer(self, name, image, def createServer(self, name, image,
flavor_name=None, min_ram=None, flavor_name=None, min_ram=None,

5
requirements.txt
View File

@ -6,13 +6,10 @@ python-daemon>=2.0.4
extras extras
statsd>=3.0 statsd>=3.0
PrettyTable>=0.6,<0.8 PrettyTable>=0.6,<0.8
# openstacksdk before 0.27.0 is TaskManager based
# 0.28.0-0.31.0 fail to upload images with glance tasks.
# 0.31.1 and 0.31.2 have a bug with image deletion in tasks API
# 0.99.0 - 0.102 lead to BadRequestException: Client Error [...] Bad networks format # 0.99.0 - 0.102 lead to BadRequestException: Client Error [...] Bad networks format
# This was due to not properly handling nova api microversions properly. 0.103 # This was due to not properly handling nova api microversions properly. 0.103
# fixes this. # fixes this.
openstacksdk>=0.27.0,!=0.28.0,!=0.29.0,!=0.30.0,!=0.31.0,!=0.31.1,!=0.31.2,!=0.99,!=0.100,!=0.101,!=0.102 openstacksdk>=0.103.0
diskimage-builder>=3.23.1 diskimage-builder>=3.23.1
voluptuous voluptuous
kazoo>=2.8.0 kazoo>=2.8.0