From f82a97f1f3b04401c6dff10c8f397ac80deff96d Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 19 Oct 2022 09:40:54 +0200 Subject: [PATCH] Fix linuxcontainers proxy URL Currently configured path for images.linuxcontainers is pointing to non-existing URL as no DNS records present for us.images.linuxcontainers.org. However, it is still used by some EM branches, so can't be simple removed as of today. Change-Id: I0aba60c81b0c3731744ec0d6cde8d1c0fb2f7b35 Needed-By: https://review.opendev.org/c/openstack/openstack-ansible/+/853029 --- playbooks/roles/mirror/templates/mirror.vhost.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/mirror/templates/mirror.vhost.j2 b/playbooks/roles/mirror/templates/mirror.vhost.j2 index 9a9a58df04..660e9304ae 100644 --- a/playbooks/roles/mirror/templates/mirror.vhost.j2 +++ b/playbooks/roles/mirror/templates/mirror.vhost.j2 @@ -257,9 +257,11 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \ # images.linuxcontainers.org + # NOTE(noonedeadpunk): This proxy is not used by anyone as of Yoga release. Only EM branches + # still utilize it. So it can be safely removed in the future. CacheEnable disk "/images.linuxcontainers" - ProxyPass "/images.linuxcontainers/" "http://us.images.linuxcontainers.org/" ttl=120 keepalive=On retry=0 - ProxyPassReverse "/images.linuxcontainers/" "http://us.images.linuxcontainers.org/" + ProxyPass "/images.linuxcontainers/" "https://us.lxd.images.canonical.com/" ttl=120 keepalive=On retry=0 + ProxyPassReverse "/images.linuxcontainers/" "https://us.lxd.images.canonical.com/" # registry.npmjs.org CacheEnable disk "/registry.npmjs"