diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-26 12:17:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-26 12:17:10 +0000 |
| commit | 89bbc96c5f395b105d6da2f824add0e5e738e914 (patch) | |
| tree | bb2480c9e6ac5e7c3bfc6e69f36d7f3eb7101fbc | |
| parent | 0c9e0b8c00ca329ac95f306fd830d4a4309d9bfa (diff) | |
| parent | 415716552921ba8a0ff5bd0863d8e14497f71cbd (diff) | |
| download | kolla-89bbc96c5f395b105d6da2f824add0e5e738e914.tar.gz kolla-89bbc96c5f395b105d6da2f824add0e5e738e914.zip | |
Merge "Enable kafka for rhel distro derivatives"
| -rw-r--r-- | docker/kafka/Dockerfile.j2 | 7 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2 index 7e825ad08..4a809aaad 100644 --- a/docker/kafka/Dockerfile.j2 +++ b/docker/kafka/Dockerfile.j2 @@ -8,10 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kafka', homedir='/kafka') }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - + {% set kafka_packages = [ + 'java-1.8.0-openjdk', + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set kafka_packages = [ 'default-jre', diff --git a/kolla/image/build.py b/kolla/image/build.py index 29d71452e..e1ecc3390 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -82,7 +82,6 @@ SKIPPED_IMAGES = { "blazar-base", "dragonflow-base", "freezer-base", - "kafka", "karbor-base", "kuryr-base", "monasca-base", @@ -96,7 +95,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'centos+source': [ - "kafka", "ovsdpdk", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 @@ -170,7 +168,6 @@ SKIPPED_IMAGES = { "blazar-base", "dragonflow-base", "freezer-base", - "kafka", "karbor-base", "kuryr-base", "monasca-base", @@ -185,7 +182,6 @@ SKIPPED_IMAGES = { ], 'oraclelinux+source': [ "bifrost-base", - "kafka", "ovsdpdk", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 |