Merge "Enable zookeeper for CentOS/OracleLinux"

docker/base/Dockerfile.j2

@@ -40,7 +40,8 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
     'kibana.yum.repo',
     'MariaDB.repo',
     'influxdb.repo',
-    'grafana.repo'
+    'grafana.repo',
+    'zookeeper.repo'
  ] %}
 {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
 COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}

docker/base/zookeeper.repo

@@ -0,0 +1,10 @@
+[iwienand-zookeeper-el7]
+name=Copr repo for zookeeper-el7 owned by iwienand
+baseurl=https://copr-be.cloud.fedoraproject.org/results/iwienand/zookeeper-el7/epel-7-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/iwienand/zookeeper-el7/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1

docker/zookeeper/Dockerfile.j2

@@ -6,10 +6,9 @@ MAINTAINER {{ maintainer }}
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
+    {% set zookeeper_packages = [
+        'zookeeper',
+    ] %}
 {% elif base_distro in ['ubuntu', 'debian'] %}
     {% set zookeeper_packages = [
         'zookeeper',

tests/test_build.py

@@ -82,7 +82,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
         "tacker",
         "vmtp",
         "watcher-base",
-        "zookeeper",
         "zun-base",
     ]
 
@@ -96,7 +95,6 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
     excluded_images = [
         "kafka",
         "mistral-base",
-        "zookeeper",
     ]
 
     def setUp(self):
@@ -160,7 +158,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
         "tacker",
         "vmtp",
         "watcher-base",
-        "zookeeper",
         "zun-base",
     ]
 
@@ -173,7 +170,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
 class BuildTestOracleLinuxSource(BuildTest, base.BaseTestCase):
     excluded_images = [
         "kafka",
-        "zookeeper",
     ]
 
     def setUp(self):