From ce68aa4e642f67ec25f858961fce4ee63e0c090f Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Sun, 22 May 2022 09:25:12 +0200 Subject: [PATCH] Don't use https in Ubuntu bionic and focal builds This is a partial revert of [0]. For the bootstrap we only use the release pocket, not updates or security, so the version of ca-certificates we install initially is too old to verify current LetsEncrypt protected hosts. [0] I455568f1e261060aefe555e9f5b4ef0830b60157 Change-Id: I673bc0ec687df6db59911f17dae1d50cbc7e3dd6 --- nodepool/nb03.opendev.org.yaml | 4 ++-- nodepool/nodepool.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodepool/nb03.opendev.org.yaml b/nodepool/nb03.opendev.org.yaml index 51c39756f6..a55dd1862f 100644 --- a/nodepool/nb03.opendev.org.yaml +++ b/nodepool/nb03.opendev.org.yaml @@ -128,7 +128,7 @@ diskimages: - ubuntu-minimal release: bionic env-vars: - DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/ubuntu-ports' + DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-focal-arm64 @@ -137,7 +137,7 @@ diskimages: - ubuntu-minimal release: focal env-vars: - DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/ubuntu-ports' + DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-jammy-arm64 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 4db6d20171..9daf266ad3 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -295,7 +295,7 @@ diskimages: - cache-devstack release: bionic env-vars: - DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu' + DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-focal @@ -306,7 +306,7 @@ diskimages: - cache-devstack release: focal env-vars: - DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu' + DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu' DIB_DEBIAN_COMPONENTS: 'main,universe' - name: ubuntu-jammy