[pbs-devel] [PATCH proxmox-offline-mirror 1/2] add support for ceph reef

[pbs-devel] [PATCH proxmox-offline-mirror 1/2] add support for ceph reef

[Stefan Sterz]

since it's the new default ceph release, add support for setting up
the ceph reef repos in the `setup` command.

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
 src/bin/proxmox-offline-mirror.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
index 9d37ea6..2f2e782 100644
--- a/src/bin/proxmox-offline-mirror.rs
+++ b/src/bin/proxmox-offline-mirror.rs
@@ -255,10 +255,14 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
                     Octopus,
                     Pacific,
                     Quincy,
+                    Reef,
                 }
 
                 let releases = match release {
-                    &Release::Bookworm => vec![(CephRelease::Quincy, "Quincy (17.x)")],
+                    Release::Bookworm => vec![
+                        (CephRelease::Quincy, "Quincy (17.x)"),
+                        (CephRelease::Reef, "Reef (18.x)"),
+                    ],
                     Release::Bullseye => {
                         vec![
                             (CephRelease::Octopus, "Octopus (15.x)"),
@@ -324,6 +328,7 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
                     CephRelease::Octopus => "octopus",
                     CephRelease::Pacific => "pacific",
                     CephRelease::Quincy => "quincy",
+                    CephRelease::Reef => "reef",
                 };
 
                 let url = format!("{base_url}-{ceph_release} {release} {components}");
-- 
2.39.2

[pbs-devel] [PATCH proxmox-offline-mirror 2/2] add missing subscription setting for ceph enterprise repos

[Stefan Sterz]

when setting up a ceph enterprise repo we didn't add a subscription
for it. this commit adds a pve subscription so that pom can properly
authenticate itself when mirroring the ceph enterprise repos.

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
 src/bin/proxmox-offline-mirror.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
index 2f2e782..d029d3d 100644
--- a/src/bin/proxmox-offline-mirror.rs
+++ b/src/bin/proxmox-offline-mirror.rs
@@ -296,10 +296,13 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
                         read_selection_from_tty("Select repository variant", variants, Some(0))?;
 
                     match variant {
-                        ProxmoxVariant::Enterprise => (
-                            "https://enterprise.proxmox.com/debian/ceph",
-                            "enterprise".to_string(),
-                        ),
+                        ProxmoxVariant::Enterprise => {
+                            use_subscription = Some(ProductType::Pve);
+                            (
+                                "https://enterprise.proxmox.com/debian/ceph",
+                                "enterprise".to_string(),
+                            )
+                        }
                         ProxmoxVariant::NoSubscription => (
                             "http://download.proxmox.com/debian/ceph",
                             "no-subscription".to_string(),
-- 
2.39.2

Re: [pbs-devel] [PATCH proxmox-offline-mirror 2/2] add missing subscription setting for ceph enterprise repos

[Maximiliano Sandoval]

Tested both patches. They generate the correct configurations for quincy
and reef.

```
mirror: ceph_quincy_bookworm
	architectures amd64
	architectures all
	base-dir /var/lib/proxmox-offline-mirror/mirrors/
	ignore-errors false
	key-path /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
	repository deb https://enterprise.proxmox.com/debian/ceph-quincy bookworm enterprise
	sync false
	use-subscription pve
	verify false

mirror: ceph_reef_bookworm
	architectures amd64
	architectures all
	base-dir /var/lib/proxmox-offline-mirror/mirrors/
	ignore-errors false
	key-path /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
	repository deb https://enterprise.proxmox.com/debian/ceph-reef bookworm enterprise
	sync false
	use-subscription pve
	verify false
```

I can confirm that without setting use-subscription it won't be possible
to sync the Ceph enteriprise repo and the first patch in this series
fixes it.

Tested-by: Maximiliano Sandoval <m.sandoval@proxmox.com>

Stefan Sterz <s.sterz@proxmox.com> writes:

> when setting up a ceph enterprise repo we didn't add a subscription
> for it. this commit adds a pve subscription so that pom can properly
> authenticate itself when mirroring the ceph enterprise repos.
>
> Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
> ---
>  src/bin/proxmox-offline-mirror.rs | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
> index 2f2e782..d029d3d 100644
> --- a/src/bin/proxmox-offline-mirror.rs
> +++ b/src/bin/proxmox-offline-mirror.rs
> @@ -296,10 +296,13 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
>                          read_selection_from_tty("Select repository variant", variants, Some(0))?;
>
>                      match variant {
> -                        ProxmoxVariant::Enterprise => (
> -                            "https://enterprise.proxmox.com/debian/ceph",
> -                            "enterprise".to_string(),
> -                        ),
> +                        ProxmoxVariant::Enterprise => {
> +                            use_subscription = Some(ProductType::Pve);
> +                            (
> +                                "https://enterprise.proxmox.com/debian/ceph",
> +                                "enterprise".to_string(),
> +                            )
> +                        }
>                          ProxmoxVariant::NoSubscription => (
>                              "http://download.proxmox.com/debian/ceph",
>                              "no-subscription".to_string(),


--
Maximiliano

[pbs-devel] applied: [PATCH proxmox-offline-mirror 1/2] add support for ceph reef

[Thomas Lamprecht]

Am 21/11/2023 um 15:48 schrieb Stefan Sterz:
> since it's the new default ceph release, add support for setting up
> the ceph reef repos in the `setup` command.
> 
> Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
> ---
>  src/bin/proxmox-offline-mirror.rs | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
>

applied both patches with Maximilano's T-b, thanks!