diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:21:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:21:57 +0000 |
| commit | 26fd382f176adbc104850f565df238253d8f9fc7 (patch) | |
| tree | cb95f603667c6bc52f47cfe9612d0c28b0cf2ef1 /kolla | |
| parent | 24c4da0218714ccc67c8b60b74eb37a414a70516 (diff) | |
| parent | a1510870e86f9cde6537ac2cbbfb055337843c90 (diff) | |
| download | kolla-26fd382f176adbc104850f565df238253d8f9fc7.tar.gz kolla-26fd382f176adbc104850f565df238253d8f9fc7.zip | |
Merge "drop infra_image_prefix"
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 4586346e2..a93661f6e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -646,7 +646,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() @@ -831,7 +830,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, @@ -1255,8 +1253,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 |