diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-18 09:58:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-18 09:58:26 +0000 |
| commit | 37bc1ffa3abb2dfc2c159de0d4540da50264d646 (patch) | |
| tree | 4eb08bc7bb84d5ade6ce230f00abde49e98edb9d /docker/base/Dockerfile.j2 | |
| parent | 140032d6e930b8abee5914d26fca7d8d29ed51d6 (diff) | |
| parent | aab455c5eb063b5e843bc0919bbae8f1687cf1d5 (diff) | |
| download | kolla-37bc1ffa3abb2dfc2c159de0d4540da50264d646.tar.gz kolla-37bc1ffa3abb2dfc2c159de0d4540da50264d646.zip | |
Merge "opensearch: move to yum/apt repos" into stable/zed
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 00bf3d2af..f056a8349 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -57,6 +57,7 @@ COPY dnf.conf /etc/dnf/dnf.conf 'grafana.repo', 'influxdb.repo', 'mariadb.repo', + 'opensearch.repo', 'proxysql.repo', 'rabbitmq_rabbitmq-server.repo', 'td.repo', @@ -157,6 +158,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-rabbitmq-38', 'epel', 'influxdb', + 'opensearch-2.x', + 'opensearch-dashboards-2.x', ] %} RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} @@ -294,6 +297,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'}, {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'}, {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'}, + {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'}, {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'}, {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'}, ] %} |