diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 82becbbe05..4932c8a30b 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 52da92deb7..483a2af427 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 3eb066f6b9..136bfffbf9 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 022e142330..a35254ddeb 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 0000000000..73014b4426 --- /dev/null +++ b/releasenotes/notes/cloudkitty-debuntu-binary-09b182fc672b7d77.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Support for Debian/Ubuntu binary (aka packaged) CloudKitty images.