diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 15:25:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 15:25:55 +0000 |
| commit | 0943e12fcabd25f0aa251f6414723a62197e69f1 (patch) | |
| tree | cf7750e6ec8c06ea6c9e4aaa8c455e9207bae4f7 /docker/base | |
| parent | 2ccb83cee19425ca081a0c106b097ec3da861ed0 (diff) | |
| parent | 792666dd79aef7d041c6d5f0ce1f57125ee1affc (diff) | |
| download | kolla-0943e12fcabd25f0aa251f6414723a62197e69f1.tar.gz kolla-0943e12fcabd25f0aa251f6414723a62197e69f1.zip | |
Merge "Added Elasticearch and its deployment."
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/base/elasticsearch.yum.repo | 6 | ||||
| -rw-r--r-- | docker/base/sources.list | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 4fe02e7e1..2b394b400 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -18,6 +18,8 @@ ENV KOLLA_INSTALL_METATYPE {{ install_metatype }} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} #### BEGIN REPO ENABLEMENT +# Turns on Elasticsearch repos +COPY elasticsearch.yum.repo /etc/yum.repos.d/elasticsearch.repo # Turns on MariaDB repos throughout the RPM build COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo @@ -28,7 +30,8 @@ RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \ && rpm --import https://download.ceph.com/keys/release.asc \ - && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \ + && rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch {% if install_metatype in ['rdo', 'mixed'] %} @@ -153,6 +156,7 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540 && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 391A9AA2147192839E9DB0315EDB1B62EC4926EA \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 08B73419AC32B4E966C1A330E84AC2C0460F3994 \ + && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 46095ACC8548582C1A2699A9D27D666CD88E42B4 \ && apt-get update \ && apt-get upgrade -y \ && apt-get dist-upgrade -y \ diff --git a/docker/base/elasticsearch.yum.repo b/docker/base/elasticsearch.yum.repo new file mode 100644 index 000000000..e9d28a615 --- /dev/null +++ b/docker/base/elasticsearch.yum.repo @@ -0,0 +1,6 @@ +[elasticsearch-2.x] +name=Elasticsearch repository for 2.x packages +baseurl=http://packages.elastic.co/elasticsearch/2.x/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 d63541f02..3a6684490 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -18,3 +18,6 @@ deb http://repo.percona.com/apt trusty main # Ceph repo deb http://download.ceph.com/debian-hammer/ trusty main + +# Elastic repo +deb http://packages.elastic.co/elasticsearch/2.x/debian stable main |