openstack/puppet-openstack-integration
Code Issues Proposed changes

Ceph: Disable IPv4 when IPv6 should be used

Browse Source 
... 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
This commit is contained in:
Takashi Kajinami 2023-03-08 08:39:42 +09:00
parent 05e4a203a7
commit f51e612495
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/ceph.pp
View File

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