From f51e6124955a3089a7e14a9d3e4b3e23f01fca21 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 8 Mar 2023 08:39:42 +0900
Subject: [PATCH] Ceph: Disable IPv4 when IPv6 should be used

... instead of enabling both of IPv4 and IPv6. This allows us to detect
any configurations relying on IPv4.

Depends-on: https://review.opendev.org/c/openstack/puppet-ceph/+/876750
Change-Id: Ic5e428013d079d7bf4f759cd9af1b52b36b2cfb2
---
 manifests/ceph.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index d7845e8fd..6f7379ba9 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -18,9 +18,11 @@ class openstack_integration::ceph (
   include openstack_integration::config
 
   if $::openstack_integration::config::ipv6 {
+    $ms_bind_ipv4 = false
     $ms_bind_ipv6 = true
   } else {
-    $ms_bind_ipv6 = undef
+    $ms_bind_ipv4 = true
+    $ms_bind_ipv6 = false
   }
 
   ensure_packages(['lvm2'], {'ensure' => 'present', before  => Exec['lvm_create']})
@@ -51,6 +53,7 @@ test -b /dev/ceph_vg/lv_data
   class { 'ceph::profile::params':
     fsid                         => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
     manage_repo                  => false, # repo already managed in openstack_integration::repo
+    ms_bind_ipv4                 => $ms_bind_ipv4,
     ms_bind_ipv6                 => $ms_bind_ipv6,
     authentication_type          => 'cephx',
     mon_host                     => $::openstack_integration::config::ip_for_url,