Install Elasticsearch and Kibana packages using yum/apt-get

Test results of this patch set are at
http://paste.openstack.org/show/490450/.

Change-Id: I2957cc70fcca34706ec50a630d785f0630c3f5c0
Closes-Bug: #1553203
changes/86/291986/5
Vikram Hosakote 7 years ago
parent f5bdcfbb60
commit ec3baf0428
  1. 3
      docker/base/Dockerfile.j2
  2. 6
      docker/base/kibana.yum.repo
  3. 3
      docker/base/sources.list
  4. 4
      docker/elasticsearch/Dockerfile.j2
  5. 22
      docker/kibana/Dockerfile.j2
  6. 1
      tools/setup_gate.sh

@ -21,6 +21,9 @@ ENV KOLLA_INSTALL_METATYPE {{ install_metatype }}
# Turns on Elasticsearch repos
COPY elasticsearch.yum.repo /etc/yum.repos.d/elasticsearch.repo
# Turns on Kibana repo
COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
# Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo

@ -0,0 +1,6 @@
[kibana-4.4]
name=Kibana repository for 4.4.x packages
baseurl=http://packages.elastic.co/kibana/4.4/centos
gpgcheck=1
gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
enabled=1

@ -21,3 +21,6 @@ deb http://download.ceph.com/debian-hammer/ trusty main
# Elastic repo
deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
# Kibana repo
deb http://packages.elastic.co/kibana/4.4/debian stable main

@ -8,7 +8,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
RUN yum -y install \
java-1.7.0-openjdk \
elasticsearch-2.1.1 \
elasticsearch \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
@ -17,7 +17,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/
RUN apt-get install -y --no-install-recommends \
openjdk-7-jre \
elasticsearch=2.1.1 \
elasticsearch \
&& apt-get clean
{% endif %}

@ -1,18 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
ENV KIBANA_VERSION 4.3.1
ENV KIBANA_DIR /opt/kibana/
ENV KIBANA_ARCHIVE kibana-${KIBANA_VERSION}-linux-x64.tar.gz
RUN useradd -r -m --user-group kibana \
&& usermod -a -G kolla kibana
RUN curl "https://download.elastic.co/kibana/kibana/$KIBANA_ARCHIVE" -o $KIBANA_ARCHIVE \
&& mkdir -p $KIBANA_DIR \
&& tar -xz --strip-components=1 -f $KIBANA_ARCHIVE -C $KIBANA_DIR \
&& chown -R kibana:kibana $KIBANA_DIR \
&& rm -f $KIBANA_ARCHIVE
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
kibana \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
kibana \
&& apt-get clean
{% endif %}
{{ include_footer }}

@ -32,6 +32,7 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main
deb http://repo.percona.com/apt trusty main
deb http://download.ceph.com/debian-hammer/ trusty main
deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
deb http://packages.elastic.co/kibana/4.4/debian stable main
EOF
fi
}

Loading…
Cancel
Save