diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml index 56e313f..ba6434a 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml @@ -91,7 +91,7 @@ ingress: hosts: core: registry.{{ vapp['guestinfo.fqdn'] }} - externalURL: registry.{{ vapp['guestinfo.fqdn'] }} + externalURL: https://registry.{{ vapp['guestinfo.fqdn'] }} harborAdminPassword: "{{ vapp['guestinfo.rootpw'] }}" notary: enabled: false diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml index f8250d0..72861ef 100644 --- a/ansible/roles/metacluster/tasks/components.yml +++ b/ansible/roles/metacluster/tasks/components.yml @@ -36,7 +36,7 @@ ansible.builtin.command: cmd: skopeo copy docker://{{ item }} docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar:{{ item }} chdir: /opt/metacluster/container-images - loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}" + loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten + dependencies.container_images}}" - name: Compress tarballs community.general.archive: diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index a5ad423..ee84a3f 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -47,6 +47,9 @@ dependencies: - community.general - kubernetes.core + container_images: + - quay.io/skopeo/stable:v1.8.0 + static_binaries: - filename: helm url: https://get.helm.sh/helm-v3.9.0-linux-amd64.tar.gz