diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-08 12:38:13 +0200 |
|---|---|---|
| committer | Dr. Jens Harbott <frickler@offenerstapel.de> | 2022-04-11 06:22:21 +0000 |
| commit | a1510870e86f9cde6537ac2cbbfb055337843c90 (patch) | |
| tree | 30343ad9f98d04be1688a6e60893a68ee3165d70 /kolla | |
| parent | ad53e1fe22fb04623718635faced5d14a4d17abe (diff) | |
| download | kolla-a1510870e86f9cde6537ac2cbbfb055337843c90.tar.gz kolla-a1510870e86f9cde6537ac2cbbfb055337843c90.zip | |
drop infra_image_prefix
We have one install_type only now so that infra stuff is not needed
anymore.
Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 208d763e5..e5a7e757e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -647,7 +647,6 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache self.image_prefix = self.base + '-' + self.install_type + '-' - self.infra_image_prefix = self.image_prefix self.regex = conf.regex self.image_statuses_bad = dict() @@ -832,7 +831,6 @@ class KollaWorker(object): 'docker_healthchecks': self.docker_healthchecks, 'supported_distro_name': supported_distro_name, 'image_prefix': self.image_prefix, - 'infra_image_prefix': self.infra_image_prefix, 'install_type': self.install_type, 'namespace': self.namespace, 'openstack_release': self.openstack_release, @@ -1256,8 +1254,7 @@ class KollaWorker(object): for parent_name, parent in sort_images.items(): for image in sort_images.values(): - if (image.parent_name == parent_name or image.parent_name == - parent_name.replace(self.install_type, 'infra')): + if (image.parent_name == parent_name): parent.children.append(image) image.parent = parent |