From ff371f13964605377a9e3a381aba01b580c3f026 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 12 Jan 2026 12:06:51 -0500 Subject: [PATCH] testnode: More s/http/https Signed-off-by: David Galloway --- roles/testnode/README.rst | 8 +-- roles/testnode/defaults/main.yml | 2 +- .../templates/apt/sources.list.jessie | 6 +- .../templates/apt/sources.list.precise | 56 +++++++++---------- .../templates/apt/sources.list.trusty | 56 +++++++++---------- .../templates/apt/sources.list.wheezy | 6 +- roles/testnode/vars/rocky_10.yml | 2 +- roles/testnode/vars/rocky_9.yml | 2 +- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index 7961b955..ef9ba389 100644 --- a/roles/testnode/README.rst +++ b/roles/testnode/README.rst @@ -53,7 +53,7 @@ This host is used by teuthology to download ceph packages and will be given high The mirror to download and install ``pip`` from:: - pip_mirror_url: "http://{{ mirror_host }}/pypi/simple" + pip_mirror_url: "https://{{ mirror_host }}/pypi/simple" A hash defining yum repos that would be common across a major version. Each key in the hash represents the filename of a yum repo created in /etc/yum.repos.d. The key/value pairs as the value for that repo @@ -65,7 +65,7 @@ will be used as the properties for the repo file:: common_yum_repos: rhel-7-fcgi-ceph: name: "RHEL 7 Local fastcgi Repo" - baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master/ + baseurl: https://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master/ enabled: 1 gpgcheck: 0 priority: 2 @@ -80,7 +80,7 @@ will be used as the properties for the repo file:: yum_repos: fedora-fcgi-ceph: name: Fedora Local fastcgi Repo - baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-fedora20-x86_64-basic/ref/master/ + baseurl: https://gitbuilder.ceph.com/mod_fastcgi-rpm-fedora20-x86_64-basic/ref/master/ enabled: 1 gpgcheck: 0 priority: 0 @@ -130,7 +130,7 @@ an apt repo to be added to sources.list:: # An Example: common_apt_repos: # mod_fastcgi for radosgw - - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main" + - "deb https://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main" A list defining version-specific apt repos. Each item in the list represents an apt repo to be added to sources.list:: diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml index 2c441e67..aa3f8509 100644 --- a/roles/testnode/defaults/main.yml +++ b/roles/testnode/defaults/main.yml @@ -3,7 +3,7 @@ mirror_host: apt-mirror.sepia.ceph.com git_mirror_host: git.ceph.com key_host: download.ceph.com gitbuilder_host: gitbuilder.ceph.com -pip_mirror_url: "http://{{ mirror_host }}/pypi/simple" +pip_mirror_url: "https://{{ mirror_host }}/pypi/simple" # yum repos common to a major version or distro common_yum_repos: {} diff --git a/roles/testnode/templates/apt/sources.list.jessie b/roles/testnode/templates/apt/sources.list.jessie index 80ba5e39..c08a9f47 100644 --- a/roles/testnode/templates/apt/sources.list.jessie +++ b/roles/testnode/templates/apt/sources.list.jessie @@ -1,4 +1,4 @@ # {{ ansible_managed }} -deb http://http.debian.net/debian jessie main contrib non-free -deb http://security.debian.org/ jessie/updates main contrib non-free -deb http://http.debian.net/debian jessie-updates main contrib non-free +deb https://http.debian.net/debian jessie main contrib non-free +deb https://security.debian.org/ jessie/updates main contrib non-free +deb https://http.debian.net/debian jessie-updates main contrib non-free diff --git a/roles/testnode/templates/apt/sources.list.precise b/roles/testnode/templates/apt/sources.list.precise index cda08008..7bde5017 100644 --- a/roles/testnode/templates/apt/sources.list.precise +++ b/roles/testnode/templates/apt/sources.list.precise @@ -1,62 +1,62 @@ # {{ ansible_managed }} -# deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted +# deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted -# deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted -# deb http://security.ubuntu.com/ubuntu precise-security main restricted +# deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted +# deb https://security.ubuntu.com/ubuntu precise-security main restricted -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# See https://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any ## review or updates from the Ubuntu security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise universe -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise universe -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates universe -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates universe +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise universe +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise universe +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates universe +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise multiverse -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-updates multiverse ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse -deb http://security.ubuntu.com/ubuntu precise-security main restricted -deb-src http://security.ubuntu.com/ubuntu precise-security main restricted -deb http://security.ubuntu.com/ubuntu precise-security universe -deb-src http://security.ubuntu.com/ubuntu precise-security universe -deb http://security.ubuntu.com/ubuntu precise-security multiverse -deb-src http://security.ubuntu.com/ubuntu precise-security multiverse +deb https://security.ubuntu.com/ubuntu precise-security main restricted +deb-src https://security.ubuntu.com/ubuntu precise-security main restricted +deb https://security.ubuntu.com/ubuntu precise-security universe +deb-src https://security.ubuntu.com/ubuntu precise-security universe +deb https://security.ubuntu.com/ubuntu precise-security multiverse +deb-src https://security.ubuntu.com/ubuntu precise-security multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. ## This software is not part of Ubuntu, but is offered by Canonical and the ## respective vendors as a service to Ubuntu users. -# deb http://{{ mirror_host }}/archive.canonical.com/ubuntu precise partner -# deb-src http://{{ mirror_host }}/archive.canonical.com/ubuntu precise partner +# deb https://{{ mirror_host }}/archive.canonical.com/ubuntu precise partner +# deb-src https://{{ mirror_host }}/archive.canonical.com/ubuntu precise partner ## Uncomment the following two lines to add software from Ubuntu's ## 'extras' repository. ## This software is not part of Ubuntu, but is offered by third-party ## developers who want to ship their latest software. -# deb http://extras.ubuntu.com/ubuntu precise main -# deb-src http://extras.ubuntu.com/ubuntu precise main +# deb https://extras.ubuntu.com/ubuntu precise main +# deb-src https://extras.ubuntu.com/ubuntu precise main diff --git a/roles/testnode/templates/apt/sources.list.trusty b/roles/testnode/templates/apt/sources.list.trusty index 19cf4888..e3f461d0 100644 --- a/roles/testnode/templates/apt/sources.list.trusty +++ b/roles/testnode/templates/apt/sources.list.trusty @@ -1,63 +1,63 @@ # {{ ansible_managed }} -# deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted +# deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted -# deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted -# deb http://security.ubuntu.com/ubuntu trusty-security main restricted +# deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted +# deb https://security.ubuntu.com/ubuntu trusty-security main restricted -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# See https://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any ## review or updates from the Ubuntu security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty universe -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty universe -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates universe -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates universe +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty universe +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty universe +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates universe +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty multiverse -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-updates multiverse ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse -deb-src http://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse +deb https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse +deb-src https://{{ mirror_host }}/archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse -deb http://security.ubuntu.com/ubuntu trusty-security main restricted -deb-src http://security.ubuntu.com/ubuntu trusty-security main restricted -deb http://security.ubuntu.com/ubuntu trusty-security universe -deb-src http://security.ubuntu.com/ubuntu trusty-security universe -deb http://security.ubuntu.com/ubuntu trusty-security multiverse -deb-src http://security.ubuntu.com/ubuntu trusty-security multiverse +deb https://security.ubuntu.com/ubuntu trusty-security main restricted +deb-src https://security.ubuntu.com/ubuntu trusty-security main restricted +deb https://security.ubuntu.com/ubuntu trusty-security universe +deb-src https://security.ubuntu.com/ubuntu trusty-security universe +deb https://security.ubuntu.com/ubuntu trusty-security multiverse +deb-src https://security.ubuntu.com/ubuntu trusty-security multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. ## This software is not part of Ubuntu, but is offered by Canonical and the ## respective vendors as a service to Ubuntu users. -# deb http://archive.canonical.com/ubuntu trusty partner -# deb-src http://archive.canonical.com/ubuntu trusty partner +# deb https://archive.canonical.com/ubuntu trusty partner +# deb-src https://archive.canonical.com/ubuntu trusty partner ## Uncomment the following two lines to add software from Ubuntu's ## 'extras' repository. ## This software is not part of Ubuntu, but is offered by third-party ## developers who want to ship their latest software. -# deb http://extras.ubuntu.com/ubuntu trusty main -# deb-src http://extras.ubuntu.com/ubuntu trusty main +# deb https://extras.ubuntu.com/ubuntu trusty main +# deb-src https://extras.ubuntu.com/ubuntu trusty main diff --git a/roles/testnode/templates/apt/sources.list.wheezy b/roles/testnode/templates/apt/sources.list.wheezy index bbe3e3e4..47d4c116 100644 --- a/roles/testnode/templates/apt/sources.list.wheezy +++ b/roles/testnode/templates/apt/sources.list.wheezy @@ -1,4 +1,4 @@ # {{ ansible_managed }} -deb http://{{ mirror_host }}/ftp.us.debian.org/debian wheezy main contrib non-free -deb http://{{ mirror_host }}/security.debian.org/debian-security/ wheezy/updates main contrib non-free -deb http://{{ mirror_host }}/ftp.us.debian.org/debian wheezy-backports main contrib non-free +deb https://{{ mirror_host }}/ftp.us.debian.org/debian wheezy main contrib non-free +deb https://{{ mirror_host }}/security.debian.org/debian-security/ wheezy/updates main contrib non-free +deb https://{{ mirror_host }}/ftp.us.debian.org/debian wheezy-backports main contrib non-free diff --git a/roles/testnode/vars/rocky_10.yml b/roles/testnode/vars/rocky_10.yml index 4f77bf56..17651f9b 100644 --- a/roles/testnode/vars/rocky_10.yml +++ b/roles/testnode/vars/rocky_10.yml @@ -4,7 +4,7 @@ common_yum_repos: lab-extras: name: "lab-extras" - baseurl: "http://{{ mirror_host }}/lab-extras/10/" + baseurl: "https://{{ mirror_host }}/lab-extras/10/" enabled: 1 gpgcheck: 0 diff --git a/roles/testnode/vars/rocky_9.yml b/roles/testnode/vars/rocky_9.yml index 56c1997c..5dfdcbae 100644 --- a/roles/testnode/vars/rocky_9.yml +++ b/roles/testnode/vars/rocky_9.yml @@ -4,7 +4,7 @@ common_yum_repos: lab-extras: name: "lab-extras" - baseurl: "http://{{ mirror_host }}/lab-extras/9/" + baseurl: "https://{{ mirror_host }}/lab-extras/9/" enabled: 1 gpgcheck: 0 -- 2.47.3