From 88cd70f90c9eb3216d8bdeb69b1c10e4198726ef Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 27 Apr 2022 09:14:11 -0700
Subject: [PATCH] Switch enable_src_repos to False in configure-mirrors
This should only be landed after we have announced this changing default
and enough time has passed for people to reasonably update their CI
systems if necessary.
Change-Id: Ibf2e2ca0579e180db074b7ab342dae15108dad27
---
roles/configure-mirrors/README.rst | 5 ++---
roles/configure-mirrors/defaults/main.yaml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/roles/configure-mirrors/README.rst b/roles/configure-mirrors/README.rst
index 3d11207c5..339219cb4 100644
--- a/roles/configure-mirrors/README.rst
+++ b/roles/configure-mirrors/README.rst
@@ -32,12 +32,11 @@ An ansible role to configure services to use mirrors.
Ubuntu Bionic.
.. zuul:rolevar:: enable_deb_src_repos
- :default: True
+ :default: False
Set this to True in order to enable deb-src entries in sources.list
configs for apt. Note this option currently only works on Debian
- (not Ubuntu) installations and will be set to default to False in
- the near future.
+ (not Ubuntu) installations.
.. zuul:rolevar:: configure_mirrors_extra_repos
:default: True
diff --git a/roles/configure-mirrors/defaults/main.yaml b/roles/configure-mirrors/defaults/main.yaml
index f8230f15f..f7bc280bf 100644
--- a/roles/configure-mirrors/defaults/main.yaml
+++ b/roles/configure-mirrors/defaults/main.yaml
@@ -11,4 +11,4 @@ http_or_https: >-
pypi_mirror: "{{ http_or_https }}://{{ pypi_fqdn }}/pypi/simple"
wheel_mirror: "{{ http_or_https }}://{{ mirror_fqdn }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}"
enable_deb_src_repos: True
-configure_mirrors_extra_repos: True
+configure_mirrors_extra_repos: False