starlingx/integ
Code Issues Proposed changes

Add ms_bind_ipv4 option to Ceph parameters

Browse Source 
For supporting Kernel 6.6, Ceph Bare Metal needs to be able
enable/disable Ceph daemons to bind IPv4 and IPv6.

By default, the system is disabling ms_bind_ipv6 for IPv4-only clusters.
The same behavior is expected disabling ms_bind_ipv4 for IPv6-only.
Otherwise, each Ceph service tries to bind Ipv4 first, leading to daemon
miscommunication and unabling to mount RBD and CephFS volumes.

Read more: https://www.spinics.net/lists/ceph-users/msg73459.html

Partial-Bug: 2074226

Test Plan:
  PASS: Build all packages and generate a custom ISO
  PASS: Testing Read/Write pod access using AIO-SX IPv4
  PASS: Testing Read/Write pod access using AIO-DX IPv4
  PASS: Testing Read/Write pod access using AIO-SX IPv6
  PASS: Testing Read/Write pod access using AIO-DX IPv6

Signed-off-by: Hediberto C Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
Change-Id: Iec1b2553de0caad17c0eaa1be31477933f327338
This commit is contained in:
Felipe Sanches Zanoni 2024-07-26 09:45:28 -03:00 committed by Hediberto C Silva
parent df89400024
commit 8e1e55284e
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
config/puppet-modules/openstack/puppet-ceph-2.4.1/debian/patches/0016-Add-ms_bind_ipv4-option-to-ceph-paremeters.patch Normal file
View File

@ -0,0 +1,52 @@
From 676307deb96d85b78b72c0e98264806411999ed2 Mon Sep 17 00:00:00 2001
From: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
Date: Fri, 26 Jul 2024 09:36:36 -0300
Subject: [PATCH] Add ms_bind_ipv4 option to ceph paremeters
Add the ms_bind_ipv4 option to be set into the ceph.conf file.
By default, the system is disabling ms_bind_ipv6 for IPv4-only clusters.
The same behavior is expected disabling ms_bind_ipv4 for IPv6-only.
Otherwise, each Ceph service tries to bind Ipv4 first, leading to daemon
miscommunication and unabling to mount RBD and CephFS volumes.
Read more: https://www.spinics.net/lists/ceph-users/msg73459.html
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
---
manifests/init.pp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index f4b8e62..69fa143 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -84,6 +84,9 @@
# [*ms_bind_ipv6*] Enables Ceph daemons to bind to IPv6 addresses.
# Optional. Boolean. Default provided by Ceph.
#
+# [*ms_bind_ipv4*] Enables Ceph daemons to bind to IPv4 addresses.
+# Optional. Boolean. Default provided by Ceph.
+#
# [*require_signatures*] If Ceph requires signatures on all
# message traffic (client<->cluster and between cluster daemons).
# Optional. Boolean. Default provided by Ceph.
@@ -157,6 +160,7 @@ class ceph (
$mon_initial_members = undef,
$mon_host = undef,
$ms_bind_ipv6 = undef,
+ $ms_bind_ipv4 = undef,
$require_signatures = undef,
$cluster_require_signatures = undef,
$service_require_signatures = undef,
@@ -204,6 +208,7 @@ this module to assign values and will be removed in a future release.')
'global/mon_initial_members': value => $mon_initial_members;
'global/mon_host': value => $mon_host;
'global/ms_bind_ipv6': value => $ms_bind_ipv6;
+ 'global/ms_bind_ipv4': value => $ms_bind_ipv4;
'global/require_signatures': value => $require_signatures;
'global/cluster_require_signatures': value => $cluster_require_signatures;
'global/service_require_signatures': value => $service_require_signatures;
--
2.25.1

1
config/puppet-modules/openstack/puppet-ceph-2.4.1/debian/patches/series
View File

@ -12,3 +12,4 @@
0013-Fix-puppet-ceph-multipath-ceph-partition-detection.patch 0013-Fix-puppet-ceph-multipath-ceph-partition-detection.patch
0014-Adjust-puppet-ceph-dependency-requirements.patch 0014-Adjust-puppet-ceph-dependency-requirements.patch
0015-Fix-the-unless-condition-of-ceph-osd-prepare.patch 0015-Fix-the-unless-condition-of-ceph-osd-prepare.patch
0016-Add-ms_bind_ipv4-option-to-ceph-paremeters.patch