From 322b261b203be5bf0a0b41c96b6c07bd54390142 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 3 May 2022 16:28:25 -0700
Subject: [PATCH] Use https with apt in our ubuntu image builds

Debian is already doing this and according to ubuntu package search
apt-transport-https is a transitional package at least as far back as
bionic. We leave xenial with http as it isn't clear if apt there
supports https.

Change-Id: I455568f1e261060aefe555e9f5b4ef0830b60157
---
 nodepool/nb03.opendev.org.yaml | 4 ++--
 nodepool/nodepool.yaml         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nodepool/nb03.opendev.org.yaml b/nodepool/nb03.opendev.org.yaml
index 071331b7ee..4e028f2d59 100644
--- a/nodepool/nb03.opendev.org.yaml
+++ b/nodepool/nb03.opendev.org.yaml
@@ -120,7 +120,7 @@ diskimages:
       - ubuntu-minimal
     release: bionic
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-focal-arm64
@@ -129,7 +129,7 @@ diskimages:
       - ubuntu-minimal
     release: focal
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: debian-bullseye-arm64
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 955dce7aec..6571373cba 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -295,7 +295,7 @@ diskimages:
       - cache-devstack
     release: bionic
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu'
+      DIB_DISTRIBUTION_MIRROR: 'https://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: 'http://mirror.dfw.rax.opendev.org/ubuntu'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-jammy
@@ -317,7 +317,7 @@ diskimages:
       - cache-devstack
     release: jammy
     env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu'
+      DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/ubuntu'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
   - name: ubuntu-xenial