Add zookeeper image

Change-Id: I6ca1ee54cfb73ead53d199ba138673fb31499cdc
Partially-Implements: blueprint monasca-containers

5 files changed, 46 insertions, 3 deletions

diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2
new file mode 100644
index 000000000..3693d13f2
--- /dev/null
+++ b/docker/zookeeper/Dockerfile.j2
@@ -0,0 +1,28 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block zookeeper_header %}{% endblock %}
+
+{% 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
+
+{% elif base_distro in ['ubuntu', 'debian'] %}
+    {% set zookeeper_packages = [
+        'zookeeper',
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(zookeeper_packages | customizable("packages")) }}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start \
+    && usermod -a -G kolla zookeeper
+
+{% block zookeeper_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER zookeeper
diff --git a/docker/zookeeper/extend_start.sh b/docker/zookeeper/extend_start.sh
new file mode 100644
index 000000000..d61fc9e64
--- /dev/null
+++ b/docker/zookeeper/extend_start.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "/var/log/kolla/zookeeper" ]]; then
+    mkdir -p /var/log/kolla/zookeeper
+fi
+if [[ $(stat -c %a /var/log/kolla/zookeeper) != "755" ]]; then
+    chmod 755 /var/log/kolla/zookeeper
+fi
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3dfd4ede0..8c37624c7 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -50,7 +50,7 @@ _PROFILE_OPTS = [
                          'kuryr', 'magnum', 'manila', 'mistral', 'murano',
                          'octavia', 'panko', 'rally', 'sahara', 'searchlight',
                          'senlin', 'solum', 'tacker' 'telegraf', 'trove',
-                         'zaqar'],
+                         'zaqar', 'zookeeper'],
                 help='Aux Images'),
     cfg.ListOpt('default',
                 default=['chrony', 'cron', 'kolla-toolbox', 'glance',
diff --git a/releasenotes/notes/add-zookeeper-2454cdfbfa7047b4.yaml b/releasenotes/notes/add-zookeeper-2454cdfbfa7047b4.yaml
new file mode 100644
index 000000000..84358a6e7
--- /dev/null
+++ b/releasenotes/notes/add-zookeeper-2454cdfbfa7047b4.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add zookeeper image, used in monasca
diff --git a/tests/test_build.py b/tests/test_build.py
index 032cb26d4..5c86e280c 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -78,6 +78,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
                        "bifrost-base",
                        "cloudkitty-base",
                        "freezer-base",
+                       "zookeeper",
                        "tacker"]
 
     def setUp(self):
@@ -87,7 +88,8 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
 
 
 class BuildTestCentosSource(BuildTest, base.BaseTestCase):
-    excluded_images = ["mistral-base"]
+    excluded_images = ["mistral-base",
+                       "zookeeper"]
 
     def setUp(self):
         super(BuildTestCentosSource, self).setUp()
@@ -142,6 +144,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
                        "bifrost-base",
                        "cloudkitty-base",
                        "freezer-base",
+                       "zookeeper",
                        "tacker"]
 
     def setUp(self):
@@ -151,7 +154,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
 
 
 class BuildTestOracleLinuxSource(BuildTest, base.BaseTestCase):
-    excluded_images = []
+    excluded_images = ["zookeeper"]
 
     def setUp(self):
         super(BuildTestOracleLinuxSource, self).setUp()