* Remove duplicated text to maintain clarity * Mention available installation methods (web-based wizard, CLI tool) * Create a table to see the support state of Ceph releases * List and link to the EOL dates of Ceph releases * Reword the descriptions of available PVE repositories
* Add two new attributes to avoid manual editing multiple lines ** debian-codename=bookworm It seems that the codename is not available in the build process, so updating the new attribute on Debian major release upgrades may be fine. ** pve-version=8 While `revnumber` ("8.3.1") is made available by the current build process, it is not as suitable as only mentioning the major version number. Signed-off-by: Alexander Zeidler <a.zeid...@proxmox.com> --- asciidoc/asciidoc-pve.conf | 2 + pve-package-repos.adoc | 165 ++++++++++++++----------------------- 2 files changed, 63 insertions(+), 104 deletions(-) diff --git a/asciidoc/asciidoc-pve.conf b/asciidoc/asciidoc-pve.conf index 0c28298..8ad635f 100644 --- a/asciidoc/asciidoc-pve.conf +++ b/asciidoc/asciidoc-pve.conf @@ -3,6 +3,8 @@ proxmoxGmbh=Proxmox Server Solutions GmbH copyright=Proxmox Server Solutions GmbH pve=Proxmox VE +pve-version=8 +debian-codename=bookworm pricing-url=https://proxmox.com/en/proxmox-virtual-environment/pricing website=https://www.proxmox.com/ forum-url=https://forum.proxmox.com/ diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc index c831cd9..e0a9fb5 100644 --- a/pve-package-repos.adoc +++ b/pve-package-repos.adoc @@ -24,6 +24,7 @@ security updates, bug fixes and new features. APT Repositories are defined in the file `/etc/apt/sources.list` and in `.list` files placed in `/etc/apt/sources.list.d/`. +[[repository_management]] Repository Management ^^^^^^^^^^^^^^^^^^^^^ @@ -120,133 +121,90 @@ deb http://download.proxmox.com/debian/pve bookworm pvetest WARNING: The `pvetest` repository should (as the name implies) only be used for testing new features or bug fixes. -[[sysadmin_package_repositories_ceph]] -Ceph Squid Enterprise Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This repository holds the enterprise {pve} Ceph 19.2 Squid packages. They are -suitable for production. Use this repository if you run the Ceph client or a -full Ceph cluster on {pve}. - -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb https://enterprise.proxmox.com/debian/ceph-squid bookworm enterprise ----- - - -Ceph Squid No-Subscription Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This Ceph repository contains the Ceph 19.2 Squid packages before they are moved -to the enterprise repository and after they where on the test repository. - -NOTE: It's recommended to use the enterprise repository for production -machines. - -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb http://download.proxmox.com/debian/ceph-squid bookworm no-subscription ----- - - -Ceph Squid Test Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This Ceph repository contains the Ceph 19.2 Squid packages before they are moved -to the main repository. It is used to test new Ceph releases on {pve}. - -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb http://download.proxmox.com/debian/ceph-squid bookworm test ----- -Ceph Reef Enterprise Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +[[sysadmin_package_repositories_ceph]] +Ceph Repositories +~~~~~~~~~~~~~~~~~ -This repository holds the enterprise {pve} Ceph 18.2 Reef packages. They are -suitable for production. Use this repository if you run the Ceph client or a -full Ceph cluster on {pve}. +The optional use of xref:chapter_pveceph[Ceph] requires a configured +Ceph repository. Start by deciding on a recent Ceph release from the +table below and perform the initial setup conveniently using the +xref:pve_ceph_install_wizard[web-based wizard or the CLI tool]. -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb https://enterprise.proxmox.com/debian/ceph-reef bookworm enterprise ----- +NOTE: Only the listed Ceph releases are supported in {pve} +{pve-version} in a hyper-converged setup (Ceph cluster runs on {pve} +cluster). If your {pve} cluster is not on version {pve-version} yet, +make sure to upgrade Ceph to one of its supported releases in advance. +See the respective {webwiki-url}Category:Ceph_Upgrade[upgrade guide] +for details. +[caption=""] +.Ceph Releases in {pve} {pve-version} +[cols="<,^,^,^"] -Ceph Reef No-Subscription Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +:t: tech-review +:r: recommended +:a: available -This Ceph repository contains the Ceph 18.2 Reef packages before they are moved -to the enterprise repository and after they where on the test repository. +|=== +| |**`ceph-squid`** |**`ceph-reef`** |**`ceph-quincy`** +|{cephdocs-url}/releases/[Estimated End-of-Life] + |2026-09 (v19.2) |2025-08 (v18.2) |2025-01 (v17.2) +|**`enterprise`** |{t} |{r} |{a} +|**`no-subscription`**|{a} |{a} |{a} +|**`test`** |{a} |{a} |{a} +|=== -NOTE: It's recommended to use the enterprise repository for production -machines. +.Repositories for {pve} {pve-version} -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb http://download.proxmox.com/debian/ceph-reef bookworm no-subscription ----- +Choose one of the following repositories during the initial Ceph +setup. Subsequent changes can be made via web interface in the +__xref:repository_management[Repository]__ panel or by manually +editing the `deb` line in the file +`/etc/apt/sources.list.d/ceph.list` . +==== +**`enterprise`** -Ceph Reef Test Repository -~~~~~~~~~~~~~~~~~~~~~~~~~ +This repository is recommended for production use and contains the +most stable packages. It is accessible if the {pve} node has a valid +subscription of any level. For details and included customer support +levels visit: -This Ceph repository contains the Ceph 18.2 Reef packages before they are moved -to the main repository. It is used to test new Ceph releases on {pve}. +{pricing-url} -.File `/etc/apt/sources.list.d/ceph.list` +[subs="attributes"] ---- -deb http://download.proxmox.com/debian/ceph-reef bookworm test +deb https://enterprise.proxmox.com/debian/<ceph-release> {debian-codename} enterprise ---- +==== -Ceph Quincy Enterprise Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== +**`no-subscription`** -This repository holds the enterprise {pve} Ceph Quincy packages. They are -suitable for production. Use this repository if you run the Ceph client or a -full Ceph cluster on {pve}. +This repository is suitable for testing and for non-production use. It +is freely accessible and does not require a valid subscription. After +some time, its package versions are also made available in the +enterprise repository. -.File `/etc/apt/sources.list.d/ceph.list` +[subs="attributes"] ---- -deb https://enterprise.proxmox.com/debian/ceph-quincy bookworm enterprise +deb http://download.proxmox.com/debian/<ceph-release> {debian-codename} no-subscription ---- +==== +==== +**`test`** -Ceph Quincy No-Subscription Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This Ceph repository contains the Ceph Quincy packages before they are moved -to the enterprise repository and after they where on the test repository. - -NOTE: It's recommended to use the enterprise repository for production -machines. +Warning, this repository is not intended for production use! It +contains the latest package versions and is primarily used by +developers to test new features and bug fixes. -.File `/etc/apt/sources.list.d/ceph.list` +[subs="attributes"] ---- -deb http://download.proxmox.com/debian/ceph-quincy bookworm no-subscription +deb http://download.proxmox.com/debian/<ceph-release> {debian-codename} test ---- - - -Ceph Quincy Test Repository -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This Ceph repository contains the Ceph Quincy packages before they are moved -to the main repository. It is used to test new Ceph releases on {pve}. - -.File `/etc/apt/sources.list.d/ceph.list` ----- -deb http://download.proxmox.com/debian/ceph-quincy bookworm test ----- - -Older Ceph Repositories -~~~~~~~~~~~~~~~~~~~~~~~ - -{pve} 8 doesn't support Ceph Pacific, Ceph Octopus, or even older releases for -hyper-converged setups. For those releases, you need to first upgrade Ceph to a -newer release before upgrading to Proxmox VE 8. - -See the respective -https://pve.proxmox.com/wiki/Category:Ceph_Upgrade[upgrade guide] for details. +==== [[sysadmin_debian_firmware_repo]] @@ -268,7 +226,6 @@ To be able to install packages from this component, run [[repos_secure_apt]] - SecureApt ~~~~~~~~~ -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel