diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-03 20:09:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-03 20:09:35 +0000 |
| commit | 96a604aa1133c04b1fd01ea3b355396ce18baf56 (patch) | |
| tree | 7e19704a92189fde421d871057a8ee996619fd5e | |
| parent | cc0487bf01d2969e354f5b10e9106cb9ec975a42 (diff) | |
| parent | 8ec710d110214aba2fbf7bd4f2973c04c00a1a5e (diff) | |
| download | kolla-96a604aa1133c04b1fd01ea3b355396ce18baf56.tar.gz kolla-96a604aa1133c04b1fd01ea3b355396ce18baf56.zip | |
Merge "Enable zookeeper for CentOS/OracleLinux"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/base/zookeeper.repo | 10 | ||||
| -rw-r--r-- | docker/zookeeper/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/test_build.py | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c7faddf6b..9fbde0f1c 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 000000000..5d2b6a6a9 --- /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 3693d13f2..8593c9a0d 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 a16491087..fcd78d532 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): |