diff --git a/operators/quay-operator/quay_disconnected.yaml b/operators/quay-operator/quay_disconnected.yaml index 6c250072..9cbbaf2a 100644 --- a/operators/quay-operator/quay_disconnected.yaml +++ b/operators/quay-operator/quay_disconnected.yaml @@ -14,7 +14,7 @@ - name: Replace registry.redhat.io with internal quay ansible.builtin.replace: path: "{{ workingDir }}/config/imagesetconfiguration.internal.yaml" - regexp: 'catalog: registry.redhat.io' + regexp: 'catalog: {{ dc_cache_address | default("registry.redhat.io") }}' replace: "catalog: {{ quayHostname }}:8443" - name: Ensure .config/containers/ exists diff --git a/playbooks/02-mirror.yaml b/playbooks/02-mirror.yaml index ab86e50d..5c2ed733 100644 --- a/playbooks/02-mirror.yaml +++ b/playbooks/02-mirror.yaml @@ -30,6 +30,19 @@ tags: always tags: always + - name: Collect plugin operators for imageset + ansible.builtin.include_tasks: + file: tasks/collect_core_plugin_operators.yaml + apply: + tags: + - mirror-registry + - mirror-plugins + - mirror-cache + tags: + - mirror-registry + - mirror-plugins + - mirror-cache + - name: Include tasks for mirror-cache ansible.builtin.include_tasks: file: tasks/mirror_cache.yaml @@ -47,17 +60,6 @@ success_msg: "Running in disconnected mode - proceeding with mirroring" tags: mirror-registry - - name: Collect plugin operators for imageset - ansible.builtin.include_tasks: - file: tasks/collect_core_plugin_operators.yaml - apply: - tags: - - mirror-registry - - mirror-plugins - tags: - - mirror-registry - - mirror-plugins - - name: Include tasks for mirror-registry ansible.builtin.include_tasks: file: tasks/mirror_registry.yaml