From 1eddbc9c944da357d2322acdd3ddbfead3555c0b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 20 Apr 2024 12:04:54 +0900
Subject: [PATCH] Ubuntu: Switch back to official repository

We replaced the ceph official repository by UCA because the official
repository didn't provide packages for jammy but now the packages
for jammy are available.

Conflicts:
	manifests/repos.pp

Change-Id: I4cb520c7250d0920f677c6411a493859bbf2a0ae
(cherry picked from commit b2aaa0db1d578991b95806fb08ee7d2839f34f00)
(cherry picked from commit 9e98a441b3c59d61ae377bbdf3c8d0cd15c475b1)
---
 manifests/repos.pp | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 6aebaee18..7b189dfe7 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -7,14 +7,6 @@ class openstack_integration::repos {
     $ceph_version_real = 'reef'
   }
 
-  if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22') >= 0 {
-    # NOTE(tkajinam): Upstream ceph repository does not provide packages for
-    #                 Ubuntu Jammy, so we use packages from UCA.
-    $enable_ceph_repository = false
-  } else {
-    $enable_ceph_repository = true
-  }
-
   case $facts['os']['family'] {
     'Debian': {
       case $facts['os']['name'] {
@@ -39,20 +31,18 @@ class openstack_integration::repos {
       }
 
       $ceph_mirror_fallback = pick($facts['ceph_mirror_host'], "http://download.ceph.com/debian-${ceph_version_real}/")
-      if $enable_ceph_repository {
-        # Ceph is both packaged on UCA and official download.ceph.com packages
-        # which we mirror. We want to use the official packages or our mirror.
-        if $ceph_mirror_fallback !~ '^http://download.ceph.com/.*' {
-          $ceph_version_cap = capitalize($ceph_version_real)
-          apt::pin { 'ceph':
-            priority   => 1001,
-            originator => "Ceph ${ceph_version_cap}",
-          }
-        } else {
-          apt::pin { 'ceph':
-            priority => 1001,
-            origin   => 'download.ceph.com',
-          }
+      # Ceph is both packaged on UCA and official download.ceph.com packages
+      # which we mirror. We want to use the official packages or our mirror.
+      if $ceph_mirror_fallback !~ '^http://download.ceph.com/.*' {
+        $ceph_version_cap = capitalize($ceph_version_real)
+        apt::pin { 'ceph':
+          priority   => 1001,
+          originator => "Ceph ${ceph_version_cap}",
+        }
+      } else {
+        apt::pin { 'ceph':
+          priority => 1001,
+          origin   => 'download.ceph.com',
         }
       }
 
@@ -121,12 +111,10 @@ class openstack_integration::repos {
     }
   }
 
-  if $enable_ceph_repository {
-    class { 'ceph::repo':
-      enable_sig  => $enable_sig,
-      enable_epel => $enable_epel,
-      ceph_mirror => $ceph_mirror,
-    }
+  class { 'ceph::repo':
+    enable_sig  => $enable_sig,
+    enable_epel => $enable_epel,
+    ceph_mirror => $ceph_mirror,
   }
 
   # NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.