diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 34bfdd2ef..657ee2b13 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -17,14 +17,22 @@ # * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the # configuration # Default is an empty list. -#apt_config: +apt_config: + # NOTE: Currently the Pulp verbatim publisher does not sync translation + # files, which results in apt update failing. Disable translations until this + # is resolved. + - content: | + Acquire::Languages "none"; + filename: 99no-languages # List of apt keys. Each item is a dict containing the following keys: # * url: URL of key # * filename: Name of a file in which to store the downloaded key. The # extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise. # Default is an empty list. -#apt_keys: +apt_keys: + - url: "https://download.docker.com/linux/ubuntu/gpg" + filename: docker.asc # A list of Apt repositories. Each item is a dict with the following keys: # * types: whitespace-separated list of repository types, e.g. deb or deb-src @@ -39,12 +47,25 @@ # * architecture: whitespace-separated list of architectures that will be used # (optional, default is unset) # Default is an empty list. -#apt_repositories: +apt_repositories: + - url: "{{ stackhpc_repo_ubuntu_focal_url }}" + suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports" + components: main restricted universe multiverse + architecture: amd64 + - url: "{{ stackhpc_repo_ubuntu_focal_security_url }}" + suites: "{{ ansible_facts.distribution_release }}-security" + components: main restricted universe multiverse + architecture: amd64 + - url: "{{ stackhpc_repo_docker_ce_ubuntu_url }}" + suites: "{{ ansible_facts.distribution_release }}" + components: stable + signed_by: docker.asc + architecture: amd64 # Whether to disable repositories in /etc/apt/sources.list. This may be used # when replacing the distribution repositories via apt_repositories. # Default is false. -#apt_disable_sources_list: +apt_disable_sources_list: true ############################################################################### # Dummy variable to allow Ansible to accept this file. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index c35c2cf49..28d1af4cd 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -321,16 +321,13 @@ kolla_build_blocks: -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} {% endif %} - # NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in - # Ark does not work if the upstream mirror pulls packages (which it does - # sometimes). - # base_ubuntu_package_sources_list: | - # RUN \ - # rm -f /etc/apt/sources.list && \ - # {% for repo in stackhpc_ubuntu_focal_repos %} - # echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \ - # {% endif %} - # {% endfor %} + base_ubuntu_package_sources_list: | + RUN \ + rm -f /etc/apt/sources.list && \ + {% for repo in stackhpc_ubuntu_focal_repos %} + echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \ + {% endif %} + {% endfor %} bifrost_base_header: | ADD additions-archive / grafana_plugins_install: | diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 7facee671..977215ea2 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -15,7 +15,7 @@ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230302T031902 stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20230310T163106 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123 stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230308T155704 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230405T060337 stackhpc_pulp_repo_docker_version: 20230203T025251 stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251 stackhpc_pulp_repo_epel_9_version: 20230302T031902 @@ -45,6 +45,6 @@ stackhpc_pulp_repo_rocky_9_1_crb_version: 20230228T044432 stackhpc_pulp_repo_rocky_9_1_extras_version: 20230228T044432 stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20230228T044432 stackhpc_pulp_repo_treasuredata_4_version: 20221105T035018 -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_ubuntu_cloud_archive_version: 20230411T065209 +stackhpc_pulp_repo_ubuntu_focal_security_version: 20230405T060337 +stackhpc_pulp_repo_ubuntu_focal_version: 20230405T060337 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index e4bc0b937..d99e5cda6 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -51,10 +51,7 @@ stackhpc_pulp_sync_for_local_container_build: false # Debs # Whether to sync Ubuntu packages. -# NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in -# Ark does not work if the upstream mirror pulls packages (which it does -# sometimes). -stackhpc_pulp_sync_ubuntu_focal: false +stackhpc_pulp_sync_ubuntu_focal: "{{ os_release == 'focal' }}" stackhpc_pulp_repository_deb_repos: # Base Ubuntu Focal repositories diff --git a/releasenotes/notes/re-enable-pulp-ubuntu-repos-d46ff8eca4a5aac3.yaml b/releasenotes/notes/re-enable-pulp-ubuntu-repos-d46ff8eca4a5aac3.yaml new file mode 100644 index 000000000..52345decb --- /dev/null +++ b/releasenotes/notes/re-enable-pulp-ubuntu-repos-d46ff8eca4a5aac3.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Re-enable Pulp Ubuntu repositories.