Description: Trixie support
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2025-05-27

Index: puppet-module-ceph/manifests/mds.pp
===================================================================
--- puppet-module-ceph.orig/manifests/mds.pp
+++ puppet-module-ceph/manifests/mds.pp
@@ -42,7 +42,7 @@
 #   Optional. Default is running.
 #
 # [*mds_id*] The ID of the MDS instance.
-#   Optional. Default is $::hostname
+#   Optional. Default is $facts['networking']['hostname']
 #
 # [*keyring*] The location of the keyring used by MDSs
 #   Optional. Same default as ceph.
@@ -58,7 +58,7 @@ class ceph::mds (
   $mds_data       = undef,
   $mds_enable     = true,
   $mds_ensure     = 'running',
-  $mds_id         = $::hostname,
+  $mds_id         = $facts['networking']['hostname'],
   $keyring        = undef,
   $cluster        = 'ceph',
 ) inherits ceph::params {
Index: puppet-module-ceph/manifests/mirror.pp
===================================================================
--- puppet-module-ceph.orig/manifests/mirror.pp
+++ puppet-module-ceph/manifests/mirror.pp
@@ -50,8 +50,8 @@ define ceph::mirror (
 
   #Xenial reports 'debian' as the service provider
   #'systemd' should cover supported RHEL type systems
-  if( ( $::service_provider == 'systemd' ) or
-  ( $::operatingsystemrelease == '16.04' ) )
+  if( ( $facts['service_provider'] == 'systemd' ) or
+  ( $facts['os']['release']['full'] == '16.04' ) )
   {
     Service{
       name   => $service_name,
Index: puppet-module-ceph/manifests/mon.pp
===================================================================
--- puppet-module-ceph.orig/manifests/mon.pp
+++ puppet-module-ceph/manifests/mon.pp
@@ -85,11 +85,11 @@ define ceph::mon (
     $mon_service = "ceph-mon-${id}"
 
     # For Ubuntu Trusty system
-    if $::service_provider == 'upstart' {
+    if $facts['service_provider'] == 'upstart' {
       $init = 'upstart'
       Service {
         name     => 'ceph-mon',
-        provider => $::service_provider,
+        provider => $facts['service_provider'],
         start    => "start ceph-mon id=${id}",
         stop     => "stop ceph-mon id=${id}",
         status   => "status ceph-mon id=${id}",
Index: puppet-module-ceph/manifests/osd.pp
===================================================================
--- puppet-module-ceph.orig/manifests/osd.pp
+++ puppet-module-ceph/manifests/osd.pp
@@ -186,7 +186,7 @@ ceph-volume lvm list ${data}
         timeout   => $exec_timeout,
         tag       => 'prepare',
       }
-      if (str2bool($::selinux) == true) {
+      if (str2bool($facts['selinux']) == true) {
         ensure_packages($ceph::params::pkg_policycoreutils, {'ensure' => 'present'})
         exec { "fcontext_${name}":
           command => "/bin/true # comment to satisfy puppet syntax requirements
Index: puppet-module-ceph/manifests/params.pp
===================================================================
--- puppet-module-ceph.orig/manifests/params.pp
+++ puppet-module-ceph/manifests/params.pp
@@ -49,7 +49,7 @@ class ceph::params (
 ) {
   $pkg_mds = 'ceph-mds'
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'Debian': {
       $pkg_radosgw         = 'radosgw'
       $user_radosgw        = 'www-data'
@@ -61,7 +61,7 @@ class ceph::params (
       $pkg_radosgw         = 'ceph-radosgw'
       $user_radosgw        = 'apache'
       $pkg_fastcgi         = 'mod_fastcgi'
-      if (Integer.new($::os['release']['major']) > 7) {
+      if (Integer.new($facts['os']['release']['major']) > 7) {
         $pkg_policycoreutils = 'policycoreutils-python-utils'
       } else {
         $pkg_policycoreutils = 'policycoreutils-python'
@@ -69,7 +69,7 @@ class ceph::params (
     }
 
     default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
+      fail("Unsupported osfamily: ${::facts['os']['family']} operatingsystem: ${::facts['os']['distro']['name']}, \
 module ${module_name} only supports osfamily Debian or RedHat")
     }
   }
Index: puppet-module-ceph/manifests/profile/mgr.pp
===================================================================
--- puppet-module-ceph.orig/manifests/profile/mgr.pp
+++ puppet-module-ceph/manifests/profile/mgr.pp
@@ -22,7 +22,7 @@
 class ceph::profile::mgr {
   require ceph::profile::base
 
-  ceph::mgr { $::hostname:
+  ceph::mgr { $facts['networking']['hostname']:
     authentication_type => $ceph::profile::params::authentication_type,
     key                 => $ceph::profile::params::mgr_key,
     inject_key          => true,
Index: puppet-module-ceph/manifests/profile/mon.pp
===================================================================
--- puppet-module-ceph.orig/manifests/profile/mon.pp
+++ puppet-module-ceph/manifests/profile/mon.pp
@@ -23,7 +23,7 @@
 class ceph::profile::mon {
   require ceph::profile::base
 
-  ceph::mon { $::hostname:
+  ceph::mon { $facts['networking']['hostname']:
     authentication_type => $ceph::profile::params::authentication_type,
     key                 => $ceph::profile::params::mon_key,
     keyring             => $ceph::profile::params::mon_keyring,
Index: puppet-module-ceph/manifests/repo.pp
===================================================================
--- puppet-module-ceph.orig/manifests/repo.pp
+++ puppet-module-ceph/manifests/repo.pp
@@ -70,7 +70,7 @@ class ceph::repo (
   $enable_sig     = $ceph::params::enable_sig,
   $ceph_mirror    = undef,
 ) inherits ceph::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     'Debian': {
       include apt
 
@@ -89,7 +89,7 @@ class ceph::repo (
       apt::source { 'ceph':
         ensure   => $ensure,
         location => $ceph_mirror_real,
-        release  => $::lsbdistcodename,
+        release  => $facts['os']['distro']['codename'],
         tag      => 'ceph',
       }
 
@@ -104,7 +104,7 @@ class ceph::repo (
         apt::source { 'ceph-fastcgi':
           ensure   => $ensure,
           location => "http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-${::lsbdistcodename}-${::hardwaremodel}-basic/ref/master",
-          release  => $::lsbdistcodename,
+          release  => $facts['os']['distro']['codename'],
           require  => Apt::Key['ceph-gitbuilder'],
         }
 
@@ -120,7 +120,7 @@ class ceph::repo (
       # If you want to deploy Ceph using packages provided by CentOS SIG
       # https://wiki.centos.org/SpecialInterestGroup/Storage/
       if $enable_sig {
-        if $::operatingsystem != 'CentOS' {
+        if $facts['os']['name'] != 'CentOS' {
           warning("CentOS SIG repository is only supported on CentOS operating system, \
 not on ${::operatingsystem}, which can lead to packaging issues.")
         }
@@ -144,8 +144,8 @@ not on ${::operatingsystem}, which can l
         Yumrepo['ceph-luminous-sig'] -> Yumrepo['ceph-storage-sig'] -> Package<| tag == 'ceph' |>
       } else {
         # If you want to deploy Ceph using packages provided by ceph.com repositories.
-        if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0))
-              or ($::operatingsystem == 'Fedora' and (versioncmp($::operatingsystemmajrelease, '19') < 0))) {
+        if ((($facts['os']['name'] == 'RedHat' or $facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['distro']['major'], '7') < 0))
+              or ($facts['os']['name'] and (versioncmp($facts['os']['distro']['major'], '19') < 0))) {
           $el = '6'
         } else {
           $el = '7'
@@ -158,7 +158,7 @@ not on ${::operatingsystem}, which can l
         }
 
 
-        if ($::operatingsystem != 'Fedora') {
+        if ($facts['os']['name'] != 'Fedora') {
           yumrepo { 'ext-ceph':
             # puppet versions prior to 3.5 do not support ensure, use enabled instead
             enabled    => $enabled,
@@ -206,7 +206,7 @@ not on ${::operatingsystem}, which can l
         }
       }
 
-      if $enable_epel and ($::operatingsystem != 'Fedora') {
+      if $enable_epel and ($facts['os']['name'] != 'Fedora') {
         yumrepo { "ext-epel-${el}":
           # puppet versions prior to 3.5 do not support ensure, use enabled instead
           enabled    => $enabled,
@@ -226,7 +226,7 @@ not on ${::operatingsystem}, which can l
     }
 
     default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
+      fail("Unsupported osfamily: ${::facts['os']['family']} operatingsystem: ${::facts['os']['distro']['name']}, \
 module ${module_name} only supports osfamily Debian and RedHat")
     }
   }
Index: puppet-module-ceph/manifests/rgw.pp
===================================================================
--- puppet-module-ceph.orig/manifests/rgw.pp
+++ puppet-module-ceph/manifests/rgw.pp
@@ -80,13 +80,13 @@ define ceph::rgw (
   $user               = $ceph::params::user_radosgw,
   $keyring_path       = "/etc/ceph/ceph.client.${name}.keyring",
   $log_file           = '/var/log/ceph/radosgw.log',
-  $rgw_dns_name       = $::fqdn,
+  $rgw_dns_name       = $facts['networking']['fqdn'],
   $rgw_socket_path    = $ceph::params::rgw_socket_path,
   $rgw_print_continue = false,
   $rgw_port           = undef,
   $frontend_type      = 'civetweb',
   $rgw_frontends      = 'civetweb port=7480',
-  $rgw_swift_url      = "http://${::fqdn}:7480",
+  $rgw_swift_url      = "http://${::networking['fqdn']}:7480",
   $syslog             = undef,
 ) {
 
@@ -102,7 +102,7 @@ define ceph::rgw (
   }
 
   ceph_config {
-    "client.${name}/host":               value => $::hostname;
+    "client.${name}/host":               value => $facts['networking']['hostname'];
     "client.${name}/keyring":            value => $keyring_path;
     "client.${name}/log_file":           value => $log_file;
     "client.${name}/user":               value => $user;
@@ -170,7 +170,7 @@ define ceph::rgw (
 
   # service definition
   # if Ubuntu does not use systemd
-  if $::service_provider == 'upstart' {
+  if $facts['service_provider'] == 'upstart' {
     if $rgw_enable {
       file { "${rgw_data}/done":
         ensure => present,
@@ -183,7 +183,7 @@ define ceph::rgw (
       start    => "start radosgw id=${name}",
       stop     => "stop radosgw id=${name}",
       status   => "status radosgw id=${name}",
-      provider => $::service_provider,
+      provider => $facts['service_provider'],
     }
   # Everything else that is supported by puppet-ceph should run systemd.
   } else {
Index: puppet-module-ceph/manifests/rgw/apache_proxy_fcgi.pp
===================================================================
--- puppet-module-ceph.orig/manifests/rgw/apache_proxy_fcgi.pp
+++ puppet-module-ceph/manifests/rgw/apache_proxy_fcgi.pp
@@ -67,7 +67,7 @@
 define ceph::rgw::apache_proxy_fcgi (
   $admin_email          = 'root@localhost',
   $docroot              = '/var/www',
-  $rgw_dns_name         = $::fqdn,
+  $rgw_dns_name         = $facts['networking']['fqdn'],
   $rgw_port             = '80',
   $rewrite_rule         = '.* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]',
   $setenv               = 'proxy-nokeepalive 1',
Index: puppet-module-ceph/manifests/rgw/keystone.pp
===================================================================
--- puppet-module-ceph.orig/manifests/rgw/keystone.pp
+++ puppet-module-ceph/manifests/rgw/keystone.pp
@@ -84,8 +84,8 @@ define ceph::rgw::keystone (
   }
 
   # FIXME(ykarel) Cleanup once https://tracker.ceph.com/issues/24228 is fixed for luminous
-  if ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
+  if ($facts['os']['name'] == 'Fedora') or
+    ($facts['os']['family'] == 'RedHat' and Integer.new($facts['os']['release']['major']) > 7) {
     ceph_config {
       "client.${name}/rgw_ldap_secret": value => '';
     }
Index: puppet-module-ceph/manifests/profile/params.pp
===================================================================
--- puppet-module-ceph.orig/manifests/profile/params.pp
+++ puppet-module-ceph/manifests/profile/params.pp
@@ -241,8 +241,6 @@ class ceph::profile::params (
   $rbd_default_features = undef,
 ) {
 
-  validate_legacy(Hash, 'validate_hash', $client_keys)
-
   if $authentication_type == 'cephx' and empty($client_keys) {
     fail("client_keys must be provided when using authentication_type = 'cephx'")
   }