From 8ec710d110214aba2fbf7bd4f2973c04c00a1a5e Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Mon, 12 Dec 2016 17:43:52 -0500
Subject: [PATCH] Enable zookeeper for CentOS/OracleLinux

Change-Id: I5e0e3afc18cba63ea0c9b7d8a9ae32ae8a774ba1
Partially-Implements: blueprint monasca-containers
---
 docker/base/Dockerfile.j2      |  3 ++-
 docker/base/zookeeper.repo     | 10 ++++++++++
 docker/zookeeper/Dockerfile.j2 |  7 +++----
 tests/test_build.py            |  4 ----
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 docker/base/zookeeper.repo

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c7faddf6bc..9fbde0f1cc 100644
--- a/docker/base/Dockerfile.j2
+++ b/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 }}
diff --git a/docker/base/zookeeper.repo b/docker/base/zookeeper.repo
new file mode 100644
index 0000000000..5d2b6a6a97
--- /dev/null
+++ b/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
diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2
index 3693d13f25..8593c9a0de 100644
--- a/docker/zookeeper/Dockerfile.j2
+++ b/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',
diff --git a/tests/test_build.py b/tests/test_build.py
index a16491087c..fcd78d5329 100644
--- a/tests/test_build.py
+++ b/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):