diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-09 13:52:36 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-10 07:42:44 +0000 |
| commit | 4d87fecd163f5e692e6843fc4709c2b66aee0797 (patch) | |
| tree | 152e146eae8d477dce23b17953ff2df30c1c3109 /kolla/template/methods.py | |
| parent | 79726bd9d5e3d23558b4495a84be9e12b0714b3f (diff) | |
| download | kolla-4d87fecd163f5e692e6843fc4709c2b66aee0797.tar.gz kolla-4d87fecd163f5e692e6843fc4709c2b66aee0797.zip | |
repos: Deduplicate repos.yaml
Introduce rpm/deb entry in repos.yaml, create a structure
[base_package_type]:
[base_distro]:
[base_distro-$arch]
Allow any of these to be undefined, defaulting to empty dict
This allows to deduplicate entries between distros of the same
base_package_type (rpm/deb)
Sort repos.yaml
Change-Id: Ifc351d5d612e6c6cc82be282aed179c656ae252c
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'kolla/template/methods.py')
| -rw-r--r-- | kolla/template/methods.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 53e0da95b..42b7399bb 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -126,8 +126,9 @@ def handle_repos(context, reponames, mode): commands = '' try: - repo_list = repo_data[base_distro] | \ - repo_data['%s-%s' % (base_distro, base_arch)] + repo_list = repo_data.get(base_package_type, dict()) | \ + repo_data.get(base_distro, dict()) | \ + repo_data.get('%s-%s' % (base_distro, base_arch), dict()) except KeyError: # NOTE(hrw): Fallback to distro list repo_list = repo_data[base_distro] |