Enable kafka for rhel distro derivatives

Missing download of jre via openjdk package

Change-Id: Icce1a92f9707b435e1d4a4a75453e21b541b2a22
This commit is contained in:
Andrew Smith 2018-01-25 14:51:34 -05:00
parent 32694fcd3e
commit 4157165529
2 changed files with 3 additions and 8 deletions

View File

@ -8,10 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='kafka', homedir='/kafka') }} {{ macros.configure_user(name='kafka', homedir='/kafka') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set kafka_packages = [
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'java-1.8.0-openjdk',
&& /bin/false ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set kafka_packages = [ {% set kafka_packages = [
'default-jre', 'default-jre',

View File

@ -82,7 +82,6 @@ SKIPPED_IMAGES = {
"blazar-base", "blazar-base",
"dragonflow-base", "dragonflow-base",
"freezer-base", "freezer-base",
"kafka",
"karbor-base", "karbor-base",
"kuryr-base", "kuryr-base",
"monasca-base", "monasca-base",
@ -96,7 +95,6 @@ SKIPPED_IMAGES = {
"zun-base", "zun-base",
], ],
'centos+source': [ 'centos+source': [
"kafka",
"ovsdpdk", "ovsdpdk",
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
# https://bugs.launchpad.net/tripleo/+bug/1744215 # https://bugs.launchpad.net/tripleo/+bug/1744215
@ -170,7 +168,6 @@ SKIPPED_IMAGES = {
"blazar-base", "blazar-base",
"dragonflow-base", "dragonflow-base",
"freezer-base", "freezer-base",
"kafka",
"karbor-base", "karbor-base",
"kuryr-base", "kuryr-base",
"monasca-base", "monasca-base",
@ -185,7 +182,6 @@ SKIPPED_IMAGES = {
], ],
'oraclelinux+source': [ 'oraclelinux+source': [
"bifrost-base", "bifrost-base",
"kafka",
"ovsdpdk", "ovsdpdk",
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
# https://bugs.launchpad.net/tripleo/+bug/1744215 # https://bugs.launchpad.net/tripleo/+bug/1744215