diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-18 07:15:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-18 07:15:02 +0000 |
| commit | db0de9b7af52251ead2ddacf2a7c283691a6d6b2 (patch) | |
| tree | 725a10a6d3d7055c9321213455730c5d3d63eb47 /docker/base | |
| parent | c61d9b5bc13146c733a82162074c009f01f89813 (diff) | |
| parent | ec3baf0428d014310482146f5196d78ad670e72a (diff) | |
| download | kolla-db0de9b7af52251ead2ddacf2a7c283691a6d6b2.tar.gz kolla-db0de9b7af52251ead2ddacf2a7c283691a6d6b2.zip | |
Merge "Install Elasticsearch and Kibana packages using yum/apt-get"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/base/kibana.yum.repo | 6 | ||||
| -rw-r--r-- | docker/base/sources.list | 3 |
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 |