openstack/kolla
Code Issues Proposed changes

Merge "Enable zookeeper for CentOS/OracleLinux"

Browse Source
This commit is contained in:
Jenkins 2017-01-03 20:09:35 +00:00 committed by Gerrit Code Review
commit 96a604aa11
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/Dockerfile.j2
View File

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

10
docker/base/zookeeper.repo Normal file
View File

@ -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

7
docker/zookeeper/Dockerfile.j2
View File

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

4
tests/test_build.py
View File

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