From f7ed1eb1eab433da532270e629767bb07244deda Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 13 Dec 2022 15:47:09 -0800 Subject: [PATCH] Fix openstack image deletion with newer sdk 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 --- nodepool/driver/openstack/provider.py | 2 +- requirements.txt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nodepool/driver/openstack/provider.py b/nodepool/driver/openstack/provider.py index c5b189e89..ed1947e0b 100755 --- a/nodepool/driver/openstack/provider.py +++ b/nodepool/driver/openstack/provider.py @@ -220,7 +220,7 @@ class OpenStackProvider(Provider, QuotaSupport): if name in self._images: del self._images[name] - return self._client.delete_image(dict(id=id)) + return self._client.delete_image(id) def createServer(self, name, image, flavor_name=None, min_ram=None, diff --git a/requirements.txt b/requirements.txt index 4e60be3b4..722785354 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,13 +6,10 @@ python-daemon>=2.0.4 extras statsd>=3.0 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 # This was due to not properly handling nova api microversions properly. 0.103 # 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 voluptuous kazoo>=2.8.0