Merge ~chris.macnaughton/ubuntu/+source/ceph:ubuntu/lunar into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/lunar

[Chris MacNaughton]

[Bryce Harrington (bryce)]

A couple notes but otherwise glad to see this.

Have you doublechecked that this change is sufficient to resolve the autopkgtest issues? (I'd toss it in a PPA and run autopkgtest against it, but might be ok to just run them locally in lxc).

review: Needs Fixing

[Chris MacNaughton (chris.macnaughton)]

I am working on this in a PPA as well, incidentally it failed to build, so digging into that now!

[Chris MacNaughton (chris.macnaughton)]

This has built successfully in a PPA now, and I'm running autopkgtests on it to confirm it functions as expected on lunar-proposed

[Chris MacNaughton (chris.macnaughton)]

Autopkgtest using this built in a PPA was successful: https://paste.ubuntu.com/p/5xgWjWk3GH/

diff --git a/debian/changelog b/debian/changelog
index 12d4058..191b5d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 ceph (17.2.0-0ubuntu9) UNRELEASED; urgency=medium
 
+  [ Peter Sabaini ]
   * Create package for the cephfs-mirror tool (LP: #2003704)
   * Fix: add the mgr.nfs package to the core modules (LP: #2003530).
 
+  [ Chris MacNaughton ]
+  * d/p/enable-python311.patch: Cherry-pick upstream change to
+    enable Python 3.11 support (LP: #2004038).
+  * d/gbp.conf: Update default-branch to lunar. 
+
  -- Peter Sabaini <[e-mail]>  Tue, 24 Jan 2023 11:17:30 +0100
 
 ceph (17.2.0-0ubuntu8) lunar; urgency=medium
diff --git a/debian/patches/enable-python311.patch b/debian/patches/enable-python311.patch
new file mode 100644
index 0000000..a84441e
--- /dev/null
+++ b/debian/patches/enable-python311.patch
@@ -0,0 +1,16 @@
+Description: cmake: add support for python 3.11
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/2004038
+Origin: https://github.com/ceph/ceph/pull/48947
+Index: ceph/cmake/modules/FindPython/Support.cmake
+===================================================================
+--- ceph.orig/cmake/modules/FindPython/Support.cmake
++++ ceph/cmake/modules/FindPython/Support.cmake
+@@ -17,7 +17,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUI
+   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+ endif()
+ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
+-  set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++  set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
+   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+ else()
diff --git a/debian/patches/series b/debian/patches/series
index 0c438d7..303105c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+enable-python311.patch
 lp1986747-fix-osd-class-dir.patch
 enable-strsignal.patch
 update-java-source-target-flags.patch