Merge pull request #1192 from stackhpc/package-repo-option

Add unified stackhpc_repos_enabled group var

Author: markgoddard

etc/kayobe/apt.yml

@@ -74,15 +74,15 @@ stackhpc_apt_repositories:
 # Do not replace apt configuration for non-overcloud hosts. This can result in
 # errors if apt reconfiguration is performed before local repository mirrors
 # are deployed.
-apt_repositories: "{{ stackhpc_apt_repositories | selectattr('required') | list if 'overcloud' in group_names else [] }}"
+apt_repositories: "{{ stackhpc_apt_repositories | selectattr('required') | list if stackhpc_repos_enabled | bool else [] }}"
 
 # Whether to disable repositories in /etc/apt/sources.list. This may be used
 # when replacing the distribution repositories via apt_repositories.
 # Default is false.
 # Do not disable the default apt configuration for non-overcloud hosts. This
 # can result in errors if apt reconfiguration is performed before local
 # repository mirrors are deployed.
-apt_disable_sources_list: "{{ 'overcloud' in group_names }}"
+apt_disable_sources_list: "{{ stackhpc_repos_enabled | bool }}"
 
 # Apt auth configuration for accessing the package repository mirror.
 stackhpc_apt_auth:
@@ -98,7 +98,7 @@ stackhpc_apt_auth:
 # * filename: Name of a file in which to store the auth configuration. The
 #   extension should be '.conf'.
 # Default is an empty list.
-apt_auth: "{{ stackhpc_apt_auth if 'overcloud' in group_names and stackhpc_repo_mirror_username is truthy else [] }}"
+apt_auth: "{{ stackhpc_apt_auth if stackhpc_repos_enabled | bool and stackhpc_repo_mirror_username is truthy else [] }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/dnf.yml

@@ -41,10 +41,10 @@
 #     file: myrepo
 #     gpgkey: http://gpgkey
 #     gpgcheck: yes
-#dnf_custom_repos:
+dnf_custom_repos: "{{ stackhpc_dnf_repos if stackhpc_repos_enabled | bool else [] }}"
 
 # A dict of custom repositories that point to the local Pulp server.
-# To use these repos, set dnf_custom_repos to the value of stackhpc_dnf_repos.
+# To use these repos, set stackhpc_repos_enabled to true.
 # This is done by default for hosts in the overcloud group via a group_vars
 # file.
 stackhpc_dnf_repos: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool else {}) }}"

etc/kayobe/inventory/group_vars/all/stackhpc-repos

@@ -0,0 +1,6 @@
+---
+# Use upstream package repos by default to avoid situations where the
+# seed-hypervisor tries to use a local pulp repo on the seed VM before the seed
+# vm has been provisioned
+# This behaviour is overriden for Overcloud hosts.
+stackhpc_repos_enabled: false

etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos

@@ -1,7 +1,7 @@
+---
 # Only use local pulp mirrors for overcloud hosts
 # to avoid situations where the seed-hypervisor 
 # tries to use a local pulp repo on the seed VM
 # before the seed vm has been provisioned
-dnf_custom_repos: "{{ stackhpc_dnf_repos }}"
-
+stackhpc_repos_enabled: true
 enable_docker_repo: false

releasenotes/notes/stackhpc-repos-enabled-10c8a698991e53c2.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added a new group variable - ``stackhpc_repos_enabled`` - for unified
+    control over usage of StackHPC Release Train package repositories. This
+    makes it easier to set which hosts do or do not pull packages from release
+    train.