Merge pull request #1015 from slagle/osprh-19793

Use separate registries.conf.d files for config

Author: openshift-merge-bot[bot]

roles/edpm_podman/defaults/main.yml

@@ -81,6 +81,7 @@ edpm_podman_default_network_config:
 #   - prefix: registry.fedoraproject.org
 #     blocked: true
 edpm_podman_registries: []
+edpm_podman_registries_conf_file: 20-edpm-podman-registries.conf
 edpm_container_default_pids_limit: 4096
 edpm_container_events_logger_mechanism: journald
 edpm_container_default_runtime: crun
@@ -103,3 +104,4 @@ edpm_podman_auth_file: ~/.config/containers/auth.json
 
 edpm_podman_registries_conf: ""
 edpm_podman_disconnected_ocp: false
+edpm_podman_disconnected_conf_file: 10-edpm-podman-disconnected.conf

roles/edpm_podman/molecule/disconnected/converge.yml

@@ -48,7 +48,7 @@
 
     - name: Assert registries.conf matches
       ansible.builtin.lineinfile:
-        name: /etc/containers/registries.conf
+        name: /etc/containers/registries.conf.d/10-edpm-podman-disconnected.conf
         search_string: 'location = "quay.io/okd/scos-content"'
         line: 'changed'
         state: present

roles/edpm_podman/tasks/install.yml

@@ -107,7 +107,7 @@
     - name: Write containers registries.conf
       ansible.builtin.template:
         src: registries.conf.j2
-        dest: /etc/containers/registries.conf
+        dest: /etc/containers/registries.conf.d/{{ edpm_podman_registries_conf_file }}
         owner: root
         group: root
         setype: etc_t
@@ -117,7 +117,7 @@
     - name: Write containers registries.conf for disconnected ocp
       ansible.builtin.copy:
         content: "{{ edpm_podman_registries_conf }}"
-        dest: /etc/containers/registries.conf
+        dest: /etc/containers/registries.conf.d/{{ edpm_podman_disconnected_conf_file }}
         owner: root
         group: root
         setype: etc_t