From f9e416eb073c004a7196fc060cbc8a2a90659ba7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 15 Aug 2025 20:50:13 +0900
Subject: [PATCH] Prepare for new lint plugins

This fixes a few lint warnings/errors detected by the following plugins
we aim to enable soon.
 - puppet-lint-file_ensure-check
 - puppet-lint-trailing_comma-check
 - puppet-lint-topscope-variable-check

Change-Id: I94315cab24a78b2b7aab570d782ef0f72c652f53
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/init.pp           | 2 +-
 manifests/mds.pp            | 2 +-
 manifests/mirror.pp         | 2 +-
 manifests/profile/client.pp | 2 +-
 manifests/profile/mds.pp    | 2 +-
 manifests/profile/mon.pp    | 2 +-
 manifests/rgw.pp            | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index fdbbb66d..dda823c6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -174,7 +174,7 @@ class ceph (
 
   package { $ceph::params::packages :
     ensure => $ensure,
-    tag    => 'ceph'
+    tag    => 'ceph',
   }
 
   if $ensure !~ /(absent|purged)/ {
diff --git a/manifests/mds.pp b/manifests/mds.pp
index 00903535..2c5bdaf6 100644
--- a/manifests/mds.pp
+++ b/manifests/mds.pp
@@ -84,7 +84,7 @@ class ceph::mds (
   service { $mds_service_name:
     ensure => $mds_ensure,
     enable => $mds_enable,
-    tag    => ['ceph-mds']
+    tag    => ['ceph-mds'],
   }
 
   package { $pkg_mds:
diff --git a/manifests/mirror.pp b/manifests/mirror.pp
index 48e60d9b..1d0511f0 100644
--- a/manifests/mirror.pp
+++ b/manifests/mirror.pp
@@ -50,7 +50,7 @@ define ceph::mirror (
     ensure => $rbd_mirror_ensure,
     enable => $rbd_mirror_enable,
     name   => $service_name,
-    tag    => ['ceph-rbd-mirror']
+    tag    => ['ceph-rbd-mirror'],
   }
 
   Ceph_config<||> ~> Service<| tag == 'ceph-rbd-mirror' |>
diff --git a/manifests/profile/client.pp b/manifests/profile/client.pp
index 6f747894..cf56ec3f 100644
--- a/manifests/profile/client.pp
+++ b/manifests/profile/client.pp
@@ -28,7 +28,7 @@ class ceph::profile::client {
   if ! defined(Class['ceph::keys']) {
     if !empty($ceph::profile::params::client_keys) {
       class { 'ceph::keys':
-        args => $ceph::profile::params::client_keys
+        args => $ceph::profile::params::client_keys,
       }
     }
   }
diff --git a/manifests/profile/mds.pp b/manifests/profile/mds.pp
index f70543dc..b21e2112 100644
--- a/manifests/profile/mds.pp
+++ b/manifests/profile/mds.pp
@@ -35,7 +35,7 @@ class ceph::profile::mds {
       keyring_path => "/var/lib/ceph/mds/ceph-${facts['networking']['hostname']}/keyring",
       secret       => $ceph::profile::params::mds_key,
       user         => 'ceph',
-      group        => 'ceph'
+      group        => 'ceph',
     } -> Service<| tag == 'ceph-mds' |>
   }
 }
diff --git a/manifests/profile/mon.pp b/manifests/profile/mon.pp
index 8a2939e1..d68699b6 100644
--- a/manifests/profile/mon.pp
+++ b/manifests/profile/mon.pp
@@ -39,7 +39,7 @@ class ceph::profile::mon {
   if !empty($ceph::profile::params::client_keys) {
     class { 'ceph::keys':
       args     => $ceph::profile::params::client_keys,
-      defaults => $defaults
+      defaults => $defaults,
     }
   }
 }
diff --git a/manifests/rgw.pp b/manifests/rgw.pp
index 7e54a0f9..ec81f321 100644
--- a/manifests/rgw.pp
+++ b/manifests/rgw.pp
@@ -180,7 +180,7 @@ define ceph::rgw (
 
   # Log file for radosgw (ownership)
   file { $log_file:
-    ensure                  => present,
+    ensure                  => file,
     owner                   => $user_real,
     mode                    => '0640',
     selinux_ignore_defaults => true,
@@ -194,7 +194,7 @@ define ceph::rgw (
     ensure => $rgw_ensure,
     enable => $rgw_enable,
     name   => "ceph-radosgw@${name}",
-    tag    => ['ceph-radosgw']
+    tag    => ['ceph-radosgw'],
   }
 
   Ceph_config<||> ~> Service<| tag == 'ceph-radosgw' |>