Transform GPG/Repo installed to be a list

While we keep current behaviour without any major changes,
having repos as a list may allow us extending the list by adding
third-party repositories for some distros if needed (like for EL10).

Change-Id: I49f56a72ac3e5e5d039240011440390d488c6abb

defaults/main.yml

@@ -226,6 +226,9 @@ lxc_centos_epel_key: >-
   {{ centos_epel_key | default('http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-' ~ ansible_facts['distribution_major_version']) }}
 lxc_hosts_epel_packages: "{{ _lxc_hosts_epel_packages | default([]) }}"
 
+lxc_centos_repo_keys: "{{ _lxc_centos_repo_keys }}"
+lxc_centos_repos: "{{ _lxc_centos_repos }}"
+
 # DEB repository options
 lxc_ubuntu_mirror: "{{ (ansible_facts['architecture'] == 'x86_64') | ternary('http://archive.ubuntu.com/ubuntu', 'http://ports.ubuntu.com/ubuntu-ports') }}"
 lxc_apt_mirror: "{{ (ansible_facts['distribution'] == 'Ubuntu') | ternary(lxc_ubuntu_mirror, 'http://deb.debian.org/debian') }}"

releasenotes/notes/lxc_centos_repo_list-34276eedd0a06560.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added variables ``lxc_centos_repo_keys`` and ``lxc_centos_repos``, which
+    allows to supply a list of repositories, which will be added to lxc_host.
+    By default, role keeps installing EPEL repository with it's GPG key.

tasks/lxc_install_dnf.yml

@@ -30,37 +30,54 @@
   when:
     - repo_removed is changed
 
-- name: Download EPEL gpg keys
+- name: If a keyfile is provided, copy gpg keyfiles to the key location
+  ansible.builtin.copy:
+    src: "{{ item.keyfile }}"
+    dest: "{{ item.key }}"
+    mode: "0644"
+  loop: "{{ lxc_centos_repo_keys | selectattr('keyfile', 'defined') }}"
+  loop_control:
+    label: "{{ item.key }}"
+
+- name: If key url is provideds, download gpg keyfiles to the key location
   ansible.builtin.get_url:
-    url: "{{ lxc_centos_epel_key }}"
+    url: "{{ item.url }}"
-    dest: /etc/pki/rpm-gpg
+    dest: "{{ item.key }}"
     mode: "0640"
+  loop: "{{ lxc_centos_repo_keys | selectattr('url', 'defined') }}"
+  loop_control:
+    label: "{{ item.key }}"
   register: _get_yum_keys
   until: _get_yum_keys is success
   retries: 5
   delay: 2
 
-- name: Install EPEL gpg keys
+- name: Install gpg keys
   ansible.builtin.rpm_key:
-    key: "/etc/pki/rpm-gpg/{{ lxc_centos_epel_key.split('/')[-1] }}"
+    key: "{{ item.key }}"
-    state: present
+    validate_certs: "{{ item.validate_certs | default(omit) }}"
+    state: "{{ item.state | default('present') }}"
+  loop: "{{ lxc_centos_repo_keys }}"
+  loop_control:
+    label: "{{ item.key }}"
 
 - name: Install the EPEL repository
   ansible.builtin.yum_repository:
-    name: epel-lxc_hosts
+    name: "{{ item.name }}"
-    baseurl: "{{ lxc_centos_epel_mirror ~ '/' ~ ansible_facts['distribution_major_version'] ~ '/Everything/' ~ ansible_facts['architecture'] }}"
+    baseurl: "{{ item.baseurl }}"
-    description: "Extra Packages for Enterprise Linux {{ ansible_facts['distribution_major_version'] }} - $basearch"
+    description: "{{ item.description | default(omit) }}"
-    gpgcheck: true
+    gpgcheck: "{{ item.gpgcheck | default(omit) }}"
-    gpgkey: "file:///etc/pki/rpm-gpg/{{ lxc_centos_epel_key.split('/')[-1] }}"
+    gpgkey: "{{ item.gpgkey }}"
-    enabled: true
+    enabled: "{{ item.enabled | default(true) }}"
-    state: present
+    state: "{{ item.state | default('present') }}"
-    includepkgs: "{{ lxc_hosts_epel_packages | join(' ') }}"
+    includepkgs: "{{ item.includepkgs | default(omit) }}"
-  register: install_epel_repo
+  register: install_repo
-  until: install_epel_repo is success
+  until: install_repo is success
   retries: 5
   delay: 2
-  when:
+  loop: "{{ lxc_centos_repos }}"
-    - lxc_hosts_epel_packages | length > 0
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Install distro packages
   ansible.builtin.package:

vars/redhat-host.yml

@@ -20,6 +20,21 @@ _lxc_hosts_epel_packages:
   - lxc*
   - python3-lxc
 
+lxc_centos_repo_keys:
+  - key: "/etc/pki/rpm-gpg/{{ lxc_centos_epel_key | basename }}"
+    url: "{{ lxc_centos_epel_key }}"
+    state: present
+
+lxc_centos_repos:
+  - name: epel-lxc_hosts
+    baseurl: "{{ lxc_centos_epel_mirror ~ '/' ~ ansible_facts['distribution_major_version'] ~ '/Everything/' ~ ansible_facts['architecture'] }}"
+    description: "Extra Packages for Enterprise Linux {{ ansible_facts['distribution_major_version'] }} - $basearch"
+    gpgcheck: true
+    gpgkey: "file:///etc/pki/rpm-gpg/{{ lxc_centos_epel_key | basename }}"
+    enabled: true
+    state: present
+    includepkgs: "{{ lxc_hosts_epel_packages | join(' ') }}"
+
 # Required rpm packages.
 _lxc_hosts_distro_packages:
   - dbus