diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-14 11:43:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-14 11:43:36 +0000 |
| commit | 504c76d0db9d65fcf289762268f53ee5296329f3 (patch) | |
| tree | a964172e86b39d1e9537c99e69b4bf2a114e6b39 /docker/base | |
| parent | 8518744133ec9cf5401021c09211fd985c386fe8 (diff) | |
| parent | bfb7e41ed0a63f97c2096cd2c792e02208db47a7 (diff) | |
| download | kolla-504c76d0db9d65fcf289762268f53ee5296329f3.tar.gz kolla-504c76d0db9d65fcf289762268f53ee5296329f3.zip | |
Merge "Upgrade Elasticsearch and Kibana to 6.x"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/apt_preferences.debian | 4 | ||||
| -rw-r--r-- | docker/base/elasticsearch.repo | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index a7497d6d8..50aed13c3 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -23,12 +23,12 @@ Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 100 # Unless it is kibana (on aarch64) -Package: kibana +Package: kibana kibana-oss Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 600 # on x86-64 use upstream package for kibana -Package: kibana +Package: kibana kibana-oss Pin: release o=elastic,b=amd64 Pin-Priority: 700 diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo index 16e589be1..b279f407b 100644 --- a/docker/base/elasticsearch.repo +++ b/docker/base/elasticsearch.repo @@ -1,8 +1,6 @@ -[elasticsearch-kibana-logstash-5.x] -name=ELK repository for 5.x packages -baseurl=https://artifacts.elastic.co/packages/5.x/yum +[elasticsearch-kibana-logstash-6.x] +name=ELK repository for 6.x packages +baseurl=https://artifacts.elastic.co/packages/oss-6.x/yum gpgcheck=1 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=0 -autorefresh=1 -type=rpm-md |