diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-27 09:35:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-27 09:35:00 +0000 |
| commit | 3be1b71948154c80f3ec247084b5049b520602b8 (patch) | |
| tree | cacdcc7bbff2a2bb61127ee4bde34079f2d76217 /docker/base | |
| parent | 3efd8126bd5b5d76809e140e5123eee5b2813d2c (diff) | |
| parent | 6bd7898a1d95157c713bdff0fe5bdf5a59b65550 (diff) | |
| download | kolla-3be1b71948154c80f3ec247084b5049b520602b8.tar.gz kolla-3be1b71948154c80f3ec247084b5049b520602b8.zip | |
Merge "opensearch: move to yum/apt repos"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/opensearch.repo | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index bb62bc4ea..37396012f 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 \ 'centos9-storage', 'epel', 'influxdb', + 'opensearch-2.x', + 'opensearch-dashboards-2.x', ] %} {% if base_arch == 'aarch64' %} @@ -302,6 +305,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {'name': 'grafana', 'url': 'https://rpm.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'}, ] %} diff --git a/docker/base/opensearch.repo b/docker/base/opensearch.repo new file mode 100644 index 000000000..19f91c3bc --- /dev/null +++ b/docker/base/opensearch.repo @@ -0,0 +1,19 @@ +[opensearch-2.x] +name=OpenSearch 2.x +baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum +enabled=0 +repo_gpgcheck=1 +gpgcheck=1 +gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp +autorefresh=1 +type=rpm-md + +[opensearch-dashboards-2.x] +name=OpenSearch Dashboards 2.x +baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/yum +enabled=0 +repo_gpgcheck=1 +gpgcheck=1 +gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp +autorefresh=1 +type=rpm-md |