From d43b3c77aedc21bd5cc092cd93bc8983a25121cf 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 | 4 ++--
 docker/base/influxdb.repo | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c299f85924..3537871bab 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -372,7 +372,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     ] %}
     {% set base_remote_apt_keys = [
       'https://packages.grafana.com/gpg.key',
-      'https://repos.influxdata.com/influxdb.key',
+      'https://repos.influxdata.com/influxdata-archive_compat.key',
     ] %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
@@ -385,7 +385,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       'https://download.docker.com/linux/debian/gpg',
       'https://packages.grafana.com/gpg.key',
       'https://packages.treasuredata.com/GPG-KEY-td-agent',
-      'https://repos.influxdata.com/influxdb.key',
+      'https://repos.influxdata.com/influxdata-archive_compat.key',
     ] %}
 {% endif %}
 
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