From 177eb37327dabc55ab61e4d45dcaeb98f84a0522 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 30 Aug 2022 14:40:24 +0100 Subject: [PATCH 1/4] Adds Rocky 8 repository config for local pulp We support Rocky 8 as a host OS with os_distribution == 'rocky'. This adds the configuration necessary to use the RPM snapshots from ark. --- etc/kayobe/pulp-repo-versions.yml | 5 ++ etc/kayobe/pulp.yml | 116 ++++++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 7f5398601..a4c8cf6f4 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -23,3 +23,8 @@ stackhpc_pulp_repo_treasuredata_4_version: 20220429T160649 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153 +stackhpc_pulp_repo_rocky_8_6_appstream_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_baseos_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_extras_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_nfv_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_powertools_version: "20220606T111205" diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index e1a8e1526..27eb10e3e 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -164,6 +164,12 @@ stackhpc_pulp_distribution_deb_production: # Whether to sync CentOS Stream 8 packages. stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" +# Whether to sync Rocky Linux 8 packages. +stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" + +# Whether to sync packages common to all RHEL derivatives. +stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_centos_stream8 }}" + stackhpc_pulp_repository_rpm_repos: # Base CentOS 8 Stream repositories - name: CentOS Stream 8 - AppStream @@ -191,6 +197,48 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8 repositories + - name: Rocky Linux 8.6 - AppStream + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/AppStream/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_appstream_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8.6 - BaseOS + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/BaseOS/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_baseos_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8.6 - Extras + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/extras/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_extras_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8.6 - NFV + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/nfv/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_nfv_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: Rocky Linux 8.6 - PowerTools + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" + client_cert: "{{ stackhpc_release_pulp_client_cert }}" + client_key: "{{ stackhpc_release_pulp_client_key }}" + policy: on_demand + sync_policy: mirror_complete + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: Extra Packages for Enterprise Linux 8 - x86_64 url: "{{ stackhpc_release_pulp_content_url }}/epel/8/Everything/x86_64/{{ stackhpc_pulp_repo_epel_version }}" @@ -217,7 +265,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_complete state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 }}" # Publication format is a subset of distribution. stackhpc_pulp_publication_rpm_development: "{{ stackhpc_pulp_distribution_rpm_development }}" @@ -244,24 +292,51 @@ stackhpc_pulp_distribution_rpm_development: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8.6 repositories + - name: "rocky-8-6-appstream-development" + repository: Rocky Linux 8.6 - AppStream + base_path: "rocky/8.6/AppStream/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-baseos-development" + repository: Rocky Linux 8.6 - BaseOS + base_path: "rocky/8.6/BaseOS/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-extras-development" + repository: Rocky Linux 8.6 - Extras + base_path: "rocky/8.6/extras/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-nfv-development" + repository: Rocky Linux 8.6 - NFV + base_path: "rocky/8.6/nfv/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-powertools-development" + repository: Rocky Linux 8.6 - PowerTools + base_path: "rocky/8.6/PowerTools/x86_64/os/development" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: "extra-packages-for-enterprise-linux-8-x86_64-development" repository: Extra Packages for Enterprise Linux 8 - x86_64 base_path: "epel/8/Everything/x86_64/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: "extra-packages-for-enterprise-linux-modular-8-x86_64-development" repository: Extra Packages for Enterprise Linux Modular 8 - x86_64 base_path: "epel/8/Modular/x86_64/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: "docker-ce-for-centos-8-development" repository: Docker CE for CentOS 8 base_path: "docker-ce/centos/8/x86_64/stable/development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Development gets promoted to production. stackhpc_pulp_distribution_rpm_production: @@ -282,24 +357,51 @@ stackhpc_pulp_distribution_rpm_production: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + # Base Rocky 8.6 repositories + - name: "rocky-8-6-appstream-production" + distribution: "rocky-8-6-appstream-development" + base_path: "rocky/8.6/AppStream/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-baseos-production" + distribution: "rocky-8-6-baseos-development" + base_path: "rocky/8.6/BaseOS/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-extras-production" + distribution: "rocky-8-6-extras-development" + base_path: "rocky/8.6/extras/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-nfv-production" + distribution: "rocky-8-6-nfv-development" + base_path: "rocky/8.6/nfv/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + - name: "rocky-8-6-powertools-production" + distribution: "rocky-8-6-powertools-development" + base_path: "rocky/8.6/PowerTools/x86_64/os/production" + state: present + required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" + # EPEL repositories - name: "extra-packages-for-enterprise-linux-8-x86_64-production" base_path: "epel/8/Everything/x86_64/production" distribution: "extra-packages-for-enterprise-linux-8-x86_64-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: "extra-packages-for-enterprise-linux-modular-8-x86_64-production" base_path: "epel/8/Modular/x86_64/production" distribution: "extra-packages-for-enterprise-linux-modular-8-x86_64-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: "docker-ce-for-centos-8-production" base_path: "docker-ce/centos/8/x86_64/stable/production" distribution: "docker-ce-for-centos-8-development" state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" ############################################################################### # Containers From 02984989a5e687d0444323a8e9f8fbbf03abfc60 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 30 Aug 2022 17:33:38 +0100 Subject: [PATCH 2/4] Abstract over version number v1 Unsure if it would be better to: 1) Update the remote on the repository 2) Change the publication to point to a new repository and keep repositories for every minor version Advantages of 1: - Single repository in pulp Advantages of 2: - Less chance of conflicts (although I think an old repo is just an old snapshot) --- etc/kayobe/pulp.yml | 88 ++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 27eb10e3e..54a757a17 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -166,6 +166,12 @@ stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" # Whether to sync Rocky Linux 8 packages. stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" +stackhpc_pulp_sync_rocky_8_minor_version: "6" +stackhpc_pulp_sync_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_sync_rocky_8_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_sync_rocky_8_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_extras_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_sync_rocky_8_nfv_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_nfv_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_sync_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" # Whether to sync packages common to all RHEL derivatives. stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_centos_stream8 }}" @@ -198,40 +204,40 @@ stackhpc_pulp_repository_rpm_repos: required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" # Base Rocky 8 repositories - - name: Rocky Linux 8.6 - AppStream - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/AppStream/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_appstream_version }}" + - name: Rocky Linux 8 - AppStream + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/AppStream/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_appstream_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand sync_policy: mirror_complete state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: Rocky Linux 8.6 - BaseOS - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/BaseOS/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_baseos_version }}" + - name: Rocky Linux 8 - BaseOS + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/BaseOS/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_baseos_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand sync_policy: mirror_complete state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: Rocky Linux 8.6 - Extras - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/extras/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_extras_version }}" + - name: Rocky Linux 8 - Extras + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/extras/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_extras_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand sync_policy: mirror_complete state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: Rocky Linux 8.6 - NFV - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/nfv/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_nfv_version }}" + - name: Rocky Linux 8 - NFV + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/nfv/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_nfv_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand sync_policy: mirror_complete state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: Rocky Linux 8.6 - PowerTools - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.6/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" + - name: Rocky Linux 8 - PowerTools + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_powertools_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -293,29 +299,29 @@ stackhpc_pulp_distribution_rpm_development: required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" # Base Rocky 8.6 repositories - - name: "rocky-8-6-appstream-development" - repository: Rocky Linux 8.6 - AppStream - base_path: "rocky/8.6/AppStream/x86_64/os/development" + - name: "rocky-8-appstream-development" + repository: Rocky Linux 8 - AppStream + base_path: "rocky/8/AppStream/x86_64/os/development" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-baseos-development" - repository: Rocky Linux 8.6 - BaseOS - base_path: "rocky/8.6/BaseOS/x86_64/os/development" + - name: "rocky-8-baseos-development" + repository: Rocky Linux 8 - BaseOS + base_path: "rocky/8/BaseOS/x86_64/os/development" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-extras-development" - repository: Rocky Linux 8.6 - Extras - base_path: "rocky/8.6/extras/x86_64/os/development" + - name: "rocky-8-extras-development" + repository: Rocky Linux 8 - Extras + base_path: "rocky/8/extras/x86_64/os/development" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-nfv-development" - repository: Rocky Linux 8.6 - NFV - base_path: "rocky/8.6/nfv/x86_64/os/development" + - name: "rocky-8-nfv-development" + repository: Rocky Linux 8 - NFV + base_path: "rocky/8/nfv/x86_64/os/development" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-powertools-development" - repository: Rocky Linux 8.6 - PowerTools - base_path: "rocky/8.6/PowerTools/x86_64/os/development" + - name: "rocky-powertools-development" + repository: Rocky Linux 8 - PowerTools + base_path: "rocky/8/PowerTools/x86_64/os/development" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" @@ -357,30 +363,30 @@ stackhpc_pulp_distribution_rpm_production: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" - # Base Rocky 8.6 repositories - - name: "rocky-8-6-appstream-production" - distribution: "rocky-8-6-appstream-development" - base_path: "rocky/8.6/AppStream/x86_64/os/production" + # Base Rocky 8 repositories + - name: "rocky-8-appstream-production" + distribution: "rocky-8-appstream-development" + base_path: "rocky/8/AppStream/x86_64/os/production" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-baseos-production" - distribution: "rocky-8-6-baseos-development" - base_path: "rocky/8.6/BaseOS/x86_64/os/production" + - name: "rocky-8-baseos-production" + distribution: "rocky-8-baseos-development" + base_path: "rocky/8/BaseOS/x86_64/os/production" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-extras-production" - distribution: "rocky-8-6-extras-development" - base_path: "rocky/8.6/extras/x86_64/os/production" + - name: "rocky-8-extras-production" + distribution: "rocky-8-extras-development" + base_path: "rocky/8/extras/x86_64/os/production" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-nfv-production" - distribution: "rocky-8-6-nfv-development" - base_path: "rocky/8.6/nfv/x86_64/os/production" + - name: "rocky-8-nfv-production" + distribution: "rocky-8-nfv-development" + base_path: "rocky/8/nfv/x86_64/os/production" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - - name: "rocky-8-6-powertools-production" - distribution: "rocky-8-6-powertools-development" - base_path: "rocky/8.6/PowerTools/x86_64/os/production" + - name: "rocky-8-powertools-production" + distribution: "rocky-8-powertools-development" + base_path: "rocky/8/PowerTools/x86_64/os/production" state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" From d75f95f7b10e6a5955ca07cfe6848167b547f820 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 30 Aug 2022 19:18:48 +0100 Subject: [PATCH 3/4] Fixups --- etc/kayobe/pulp.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 54a757a17..91c16d2c3 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -166,12 +166,15 @@ stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" # Whether to sync Rocky Linux 8 packages. stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" -stackhpc_pulp_sync_rocky_8_minor_version: "6" +# Rocky 8 minor version number. Supported values: 6. +stackhpc_pulp_sync_rocky_8_minor_version: 6 +# Rocky 8 Snapshot versions. The defaults use the appropriate version from +# pulp-repo-versions.yml for the selected minor release. stackhpc_pulp_sync_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" stackhpc_pulp_sync_rocky_8_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" stackhpc_pulp_sync_rocky_8_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_extras_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" stackhpc_pulp_sync_rocky_8_nfv_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_nfv_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" -stackhpc_pulp_sync_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_sync_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_powertools_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" # Whether to sync packages common to all RHEL derivatives. stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_centos_stream8 }}" @@ -237,7 +240,7 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - name: Rocky Linux 8 - PowerTools - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_powertools_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -253,7 +256,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_content_only state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" - name: Extra Packages for Enterprise Linux Modular 8 - x86_64 url: "{{ stackhpc_release_pulp_content_url }}/epel/8/Modular/x86_64/{{ stackhpc_pulp_repo_epel_modular_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" @@ -261,7 +264,7 @@ stackhpc_pulp_repository_rpm_repos: policy: on_demand sync_policy: mirror_complete state: present - required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" + required: "{{ stackhpc_pulp_sync_el_8 | bool }}" # Third-party repositories - name: Docker CE for CentOS 8 @@ -298,7 +301,7 @@ stackhpc_pulp_distribution_rpm_development: state: present required: "{{ stackhpc_pulp_sync_centos_stream8 | bool }}" - # Base Rocky 8.6 repositories + # Base Rocky 8 repositories - name: "rocky-8-appstream-development" repository: Rocky Linux 8 - AppStream base_path: "rocky/8/AppStream/x86_64/os/development" From 5e83b37f23db654ca948f5252c130cc16feb40ff Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 31 Aug 2022 14:40:01 +0100 Subject: [PATCH 4/4] Address code review comment Upadting variable name after feedback --- etc/kayobe/pulp.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 91c16d2c3..3dd051889 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -167,14 +167,14 @@ stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" # Whether to sync Rocky Linux 8 packages. stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" # Rocky 8 minor version number. Supported values: 6. -stackhpc_pulp_sync_rocky_8_minor_version: 6 +stackhpc_pulp_repo_rocky_8_minor_version: 6 # Rocky 8 Snapshot versions. The defaults use the appropriate version from # pulp-repo-versions.yml for the selected minor release. -stackhpc_pulp_sync_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" -stackhpc_pulp_sync_rocky_8_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" -stackhpc_pulp_sync_rocky_8_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_extras_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" -stackhpc_pulp_sync_rocky_8_nfv_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_nfv_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" -stackhpc_pulp_sync_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_powertools_version' % stackhpc_pulp_sync_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_baseos_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_extras_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_nfv_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_nfv_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" +stackhpc_pulp_repo_rocky_8_powertools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_powertools_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" # Whether to sync packages common to all RHEL derivatives. stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_centos_stream8 }}" @@ -208,7 +208,7 @@ stackhpc_pulp_repository_rpm_repos: # Base Rocky 8 repositories - name: Rocky Linux 8 - AppStream - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/AppStream/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_appstream_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/AppStream/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_appstream_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -216,7 +216,7 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - name: Rocky Linux 8 - BaseOS - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/BaseOS/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_baseos_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/BaseOS/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_baseos_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -224,7 +224,7 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - name: Rocky Linux 8 - Extras - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/extras/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_extras_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/extras/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_extras_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -232,7 +232,7 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - name: Rocky Linux 8 - NFV - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/nfv/x86_64/os/{{ stackhpc_pulp_sync_rocky_8_nfv_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/nfv/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_nfv_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand @@ -240,7 +240,7 @@ stackhpc_pulp_repository_rpm_repos: state: present required: "{{ stackhpc_pulp_sync_rocky_8 | bool }}" - name: Rocky Linux 8 - PowerTools - url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_sync_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" + url: "{{ stackhpc_release_pulp_content_url }}/rocky/8.{{ stackhpc_pulp_repo_rocky_8_minor_version }}/PowerTools/x86_64/os/{{ stackhpc_pulp_repo_rocky_8_6_powertools_version }}" client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand