diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-23 14:22:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-23 14:22:14 +0000 |
| commit | f16d839dafaa914002b81ceb4335572d10246f29 (patch) | |
| tree | edece4911ed712850df925acc27e4f12c9c05bd4 | |
| parent | d2f9101b31efb8692f15c1ddd8f8bb269d300914 (diff) | |
| parent | 11b445126093cc323e90cade9435f0467737b85d (diff) | |
| download | kolla-f16d839dafaa914002b81ceb4335572d10246f29.tar.gz kolla-f16d839dafaa914002b81ceb4335572d10246f29.zip | |
Merge "Allow build debian/ubuntu-binary cloudkitty images"
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/cloudkitty-debuntu-binary-09b182fc672b7d77.yaml | 4 |
5 files changed, 13 insertions, 8 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 82becbbe0..4932c8a30 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -17,8 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set cloudkitty_api_packages = [ + 'cloudkitty-api' + ] %} {% endif %} {% elif install_type == 'source' %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 52da92deb..483a2af42 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -18,8 +18,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set cloudkitty_base_packages = [ + 'cloudkitty-common', + ] %} {% endif %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 3eb066f6b..136bfffbf 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -16,8 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set cloudkitty_processor_packages = [ + 'cloudkitty-processor', + ] %} {% endif %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 285e3df54..a86872675 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -137,13 +137,11 @@ UNBUILDABLE_IMAGES = { }, 'debian+binary': { - "cloudkitty-base", # no support in Dockerfile "nova-serialproxy", # no binary package "tacker-base", # no binary package }, 'ubuntu+binary': { - "cloudkitty-base", "senlin-conductor", # no binary package "senlin-health-manager", # no binary package "tacker-base", diff --git a/releasenotes/notes/cloudkitty-debuntu-binary-09b182fc672b7d77.yaml b/releasenotes/notes/cloudkitty-debuntu-binary-09b182fc672b7d77.yaml new file mode 100644 index 000000000..73014b442 --- /dev/null +++ b/releasenotes/notes/cloudkitty-debuntu-binary-09b182fc672b7d77.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Support for Debian/Ubuntu binary (aka packaged) CloudKitty images. |