From 54737cd13f90a695d126d39a779199dd51dc8653 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 7 Jul 2021 17:18:26 +0100 Subject: [PATCH] baremetal: use docker_yum_gpgkey to fetch docker GPG key Currently, if you override docker_yum_url, the repo must contain a GPG key at {{ docker_yum_url }}/gpg, despite the fact that the GPG key URL can be overridden separately via docker_yum_gpgkey. This change uses docker_yum_gpgkey consistently, avoiding the need to keep the key in the repo. Closes-Bug: #1934913 Change-Id: If8e6a02ce0760123f7b076c711727ef575965192 --- ansible/roles/baremetal/tasks/pre-install.yml | 2 +- releasenotes/notes/bug-1934913-a8d436e3d0b950b4.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1934913-a8d436e3d0b950b4.yaml diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml index 903bb66e96..94c8f7ce0c 100644 --- a/ansible/roles/baremetal/tasks/pre-install.yml +++ b/ansible/roles/baremetal/tasks/pre-install.yml @@ -144,7 +144,7 @@ - name: Install docker rpm gpg key rpm_key: state: present - key: "{{ docker_yum_url }}/gpg" + key: "{{ docker_yum_gpgkey }}" become: True when: docker_yum_gpgcheck | bool when: ansible_facts.os_family == 'RedHat' diff --git a/releasenotes/notes/bug-1934913-a8d436e3d0b950b4.yaml b/releasenotes/notes/bug-1934913-a8d436e3d0b950b4.yaml new file mode 100644 index 0000000000..a72b7a2424 --- /dev/null +++ b/releasenotes/notes/bug-1934913-a8d436e3d0b950b4.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue seen when customising the Docker Yum repository URL on + CentOS, where the ``docker_yum_gpgkey`` variable is not used consistently. + `LP#1934913 `__