diff --git a/files/gpg/764429E6 b/files/gpg/RPM-GPG-KEY-CentOS-SIG-Cloud similarity index 100% rename from files/gpg/764429E6 rename to files/gpg/RPM-GPG-KEY-CentOS-SIG-Cloud diff --git a/files/gpg/61E8806C b/files/gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO similarity index 100% rename from files/gpg/61E8806C rename to files/gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO diff --git a/tasks/openstack_host_install_yum.yml b/tasks/openstack_host_install_yum.yml index 6ff6ccc8..3543a0df 100644 --- a/tasks/openstack_host_install_yum.yml +++ b/tasks/openstack_host_install_yum.yml @@ -27,10 +27,14 @@ - name: Copy validated GPG keys copy: src: "gpg/{{ item | basename }}" - dest: /tmp/ + dest: /etc/pki/rpm-gpg/ + mode: '0644' with_fileglob: - "gpg/*" +- name: Ensure GPG keys have the correct SELinux contexts applied + command: restorecon -Rv /etc/pki/rpm-gpg/ + # Handle gpg keys manually - name: Install gpg keys rpm_key: diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 958272de..94caf13d 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -81,9 +81,9 @@ openstack_host_required_distro_packages: openstack_host_rdo_repos_keys: - repo: openstack-pike - keyfile: /tmp/764429E6 + keyfile: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud - repo: rdo-qemu-ev - keyfile: /tmp/61E8806C + keyfile: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO openstack_host_rdo_repos: - file: rdo-qemu-ev