aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorVikram Hosakote <vhosakot@cisco.com>2016-03-12 05:11:00 +0000
committerVikram Hosakote <vhosakot@cisco.com>2016-03-18 04:05:30 +0000
commitec3baf0428d014310482146f5196d78ad670e72a (patch)
tree1bf0544c6c16b4f8ed91c572f09f509fdea0563d /docker/base
parentf5bdcfbb607ce6b9604ebc6750b31e2361e168b9 (diff)
downloadkolla-ec3baf0428d014310482146f5196d78ad670e72a.tar.gz
kolla-ec3baf0428d014310482146f5196d78ad670e72a.zip
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
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j23
-rw-r--r--docker/base/kibana.yum.repo6
-rw-r--r--docker/base/sources.list3
3 files changed, 12 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index be506e592..afcc5b30b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -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
diff --git a/docker/base/kibana.yum.repo b/docker/base/kibana.yum.repo
new file mode 100644
index 000000000..4d5d3e50b
--- /dev/null
+++ b/docker/base/kibana.yum.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
diff --git a/docker/base/sources.list b/docker/base/sources.list
index 9e19fe490..ecc71223e 100644
--- a/docker/base/sources.list
+++ b/docker/base/sources.list
@@ -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