Skip to content

Commit f169a46

Browse files
Updated docs for jammy config
1 parent 10c15ce commit f169a46

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

doc/source/configuration/release-train.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This configuration provides the following:
3838

3939
* Configuration to deploy a local Pulp service as a container on the seed
4040
* Pulp repository definitions for CentOS Stream 8, Rocky Linux 8/9 and Ubuntu
41-
Focal
41+
Focal/Jammy
4242
* Playbooks to synchronise a local Pulp service with Ark
4343
* Configuration to use the local Pulp repository mirrors on control plane hosts
4444
* Configuration to use the local Pulp container registry on control plane hosts
@@ -80,14 +80,12 @@ The Ark pulp credentials issued by StackHPC should be configured in
8080
Package repositories
8181
--------------------
8282

83-
Currently, Ark does not provide package repositories for Ubuntu Jammy 22.04 -
84-
only container images.
85-
86-
CentOS Stream 8, Rocky Linux 8/9, and Ubuntu Focal package repositories are
83+
CentOS Stream 8, Rocky Linux 8/9 and Ubuntu Focal/Jammy package repositories are
8784
synced based on the value of ``os_distribution`` and ``os_release`` . If you
88-
need to sync multiple RHEL-like distributions,
89-
``stackhpc_pulp_sync_centos_stream8``, ``stackhpc_pulp_sync_rocky_8`` and
90-
``stackhpc_pulp_sync_rocky_9`` in ``etc/kayobe/pulp.yml`` may be set to
85+
need to sync multiple RHEL-like distributions or Ubuntu releases,
86+
``stackhpc_pulp_sync_centos_stream8``, ``stackhpc_pulp_sync_rocky_8``
87+
``stackhpc_pulp_sync_rocky_9``, ``stackhpc_pulp_sync_ubuntu_jammy`` and
88+
``stackhpc_pulp_sync_ubuntu_focal`` in ``etc/kayobe/pulp.yml`` may be set to
9189
``true``.
9290

9391
On Ark, each package repository provides versioned snapshots using a datetime
@@ -99,10 +97,10 @@ repository.
9997
Package managers
10098
----------------
10199

102-
For Ubuntu Focal systems, the package manager configuration is provided by
100+
For Ubuntu Focal and Jammy systems, the package manager configuration is provided by
103101
``stackhpc_apt_repositories`` in ``etc/kayobe/apt.yml``.
104102

105-
The configuration is applied by default to all Ubuntu Focal hosts. The
103+
The configuration is applied by default to all Ubuntu Focal and Jammy hosts. The
106104
configuration can be overridden by changing the repository definitions in
107105
``apt_repositories`` or toggling ``apt_disable_sources_list`` to use the default
108106
apt repositories. This can be done on a host-by host basis by defining the

etc/kayobe/apt.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ stackhpc_apt_repositories:
6262
signed_by: docker.asc
6363
architecture: amd64
6464

65-
# Disable pulp apt repos on Ubuntu Jammy until they are published.
6665
apt_repositories: "{{ stackhpc_apt_repositories }}"
6766

6867
# Whether to disable repositories in /etc/apt/sources.list. This may be used

etc/kayobe/pulp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ stackhpc_pulp_distribution_deb_production:
290290
base_path: "docker-ce/ubuntu/production"
291291
mode: verbatim
292292
state: present
293-
required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
293+
required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
294294

295295
# Base Ubuntu Jammy repositories
296296
- name: "ubuntu-jammy-production"

0 commit comments

Comments
 (0)