aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorDoug Szumski <doug@stackhpc.com>2018-03-02 10:26:07 +0000
committerDoug Szumski <doug@stackhpc.com>2018-03-12 12:40:51 +0000
commitb8110e559cf0f6dc1454558ea26ad49a4ce129c5 (patch)
treee1c11a8618674e230dbc42a2ac35bd7227745dda /docker/base
parent4c58d99c2760e3d00fc35a9c0ec69d258f86d62c (diff)
downloadkolla-b8110e559cf0f6dc1454558ea26ad49a4ce129c5.tar.gz
kolla-b8110e559cf0f6dc1454558ea26ad49a4ce129c5.zip
Update ZooKeeper from 3.4.9 to 3.4.10
3.4.10 is the current stable release of Zookeeper. sha1sum is from: http://www-eu.apache.org/dist/zookeeper/stable/ zookeeper-3.4.10.tar.gz.sha1 Change-Id: I745f3d5949be66f8463e1e1a3d02b25d2606d256 Partially-Implements: blueprint monasca-containers
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j23
-rw-r--r--docker/base/zookeeper.repo10
2 files changed, 1 insertions, 12 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a003bbed4..4d6006c20 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -68,8 +68,7 @@ COPY yum.conf /etc/yum.conf
'nfs_ganesha.repo',
'opendaylight.repo',
'sensu.repo',
- 'td.repo',
- 'zookeeper.repo'
+ 'td.repo'
] %}
{% set base_yum_repo_keys = [
diff --git a/docker/base/zookeeper.repo b/docker/base/zookeeper.repo
deleted file mode 100644
index 5d2b6a6a9..000000000
--- a/docker/base/zookeeper.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[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