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
This commit is contained in:
Doug Szumski 2018-03-02 10:26:07 +00:00
parent 4c58d99c27
commit b8110e559c
3 changed files with 17 additions and 15 deletions

View File

@ -68,8 +68,7 @@ COPY yum.conf /etc/yum.conf
'nfs_ganesha.repo', 'nfs_ganesha.repo',
'opendaylight.repo', 'opendaylight.repo',
'sensu.repo', 'sensu.repo',
'td.repo', 'td.repo'
'zookeeper.repo'
] %} ] %}
{% set base_yum_repo_keys = [ {% set base_yum_repo_keys = [

View File

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

View File

@ -5,20 +5,33 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{{ macros.configure_user(name='zookeeper') }} {{ macros.configure_user(name='zookeeper', homedir='/opt/zookeeper') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set zookeeper_packages = [ {% set zookeeper_packages = [
'zookeeper', 'java-1.8.0-openjdk',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set zookeeper_packages = [ {% set zookeeper_packages = [
'zookeeper', 'default-jre',
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(zookeeper_packages | customizable("packages")) }} {{ macros.install_packages(zookeeper_packages | customizable("packages")) }}
{% block zookeeper_version %}
ENV zookeeper_version=3.4.10
ENV zookeeper_url=http://apache.mirror.anlx.net/zookeeper/stable/zookeeper-${zookeeper_version}.tar.gz
ENV zookeeper_pkg_sha1sum=eb2145498c5f7a0d23650d3e0102318363206fba
{% endblock %}
{% block zookeeper_binary_install %}
RUN curl -sSL -o /tmp/zookeeper.tar.gz ${zookeeper_url} \
&& echo "${zookeeper_pkg_sha1sum} /tmp/zookeeper.tar.gz" | sha1sum -c \
&& tar --strip 1 -xvf /tmp/zookeeper.tar.gz -C /opt/zookeeper \
&& rm -f /tmp/zookeeper.tar.gz
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start