From 3c30600c6f4c192589ed2179b3737dc4efe3ed2b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 30 Jan 2023 11:29:04 +0100
Subject: [PATCH] influxdb: Update gpg key

Influx repo gpg key has been rotated as of of 2023-01-26 [1].

[1]: https://www.influxdata.com/blog/linux-package-signing-key-rotation/

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/871821

Change-Id: I76b35bb20ddc0130ca15ff03942e1a97f5d36ff0
(cherry picked from commit ab70c7618b3b7e025759fe38c8692f66ef420b15)
---
 docker/base/Dockerfile.j2 | 2 +-
 docker/base/influxdb.repo | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 3e4def8afa..d9570b3efb 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -331,7 +331,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% set base_remote_apt_keys = [
    {'name': 'elasticsearch', 'url': 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'},
    {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
-   {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.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': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/repo_pub_key'},
    {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
diff --git a/docker/base/influxdb.repo b/docker/base/influxdb.repo
index 36011af968..b060ab85c8 100644
--- a/docker/base/influxdb.repo
+++ b/docker/base/influxdb.repo
@@ -3,4 +3,4 @@ name = InfluxDB Repository - RHEL $releasever
 baseurl = https://repos.influxdata.com/rhel/$releasever/$basearch/stable
 enabled = 0
 gpgcheck = 1
-gpgkey = https://repos.influxdata.com/influxdb.key
+gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key