openstack/puppet-ceph
Code Issues Proposed changes

Prepare for new lint plugins

Browse Source 
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>
This commit is contained in:
Takashi Kajinami
2025-08-15 20:50:13 +09:00
parent 3ea0150dd1
commit f9e416eb07
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -174,7 +174,7 @@ class ceph (
package { $ceph::params::packages : package { $ceph::params::packages :
ensure => $ensure, ensure => $ensure,
tag => 'ceph' tag => 'ceph',
} }
if $ensure !~ /(absent|purged)/ { if $ensure !~ /(absent|purged)/ {

2
manifests/mds.pp
View File

@@ -84,7 +84,7 @@ class ceph::mds (
service { $mds_service_name: service { $mds_service_name:
ensure => $mds_ensure, ensure => $mds_ensure,
enable => $mds_enable, enable => $mds_enable,
tag => ['ceph-mds'] tag => ['ceph-mds'],
} }
package { $pkg_mds: package { $pkg_mds:

2
manifests/mirror.pp
View File

@@ -50,7 +50,7 @@ define ceph::mirror (
ensure => $rbd_mirror_ensure, ensure => $rbd_mirror_ensure,
enable => $rbd_mirror_enable, enable => $rbd_mirror_enable,
name => $service_name, name => $service_name,
tag => ['ceph-rbd-mirror'] tag => ['ceph-rbd-mirror'],
} }
Ceph_config<||> ~> Service<| tag == 'ceph-rbd-mirror' |> Ceph_config<||> ~> Service<| tag == 'ceph-rbd-mirror' |>

2
manifests/profile/client.pp
View File

@@ -28,7 +28,7 @@ class ceph::profile::client {
if ! defined(Class['ceph::keys']) { if ! defined(Class['ceph::keys']) {
if !empty($ceph::profile::params::client_keys) { if !empty($ceph::profile::params::client_keys) {
class { 'ceph::keys': class { 'ceph::keys':
args => $ceph::profile::params::client_keys args => $ceph::profile::params::client_keys,
} }
} }
} }

2
manifests/profile/mds.pp
View File

@@ -35,7 +35,7 @@ class ceph::profile::mds {
keyring_path => "/var/lib/ceph/mds/ceph-${facts['networking']['hostname']}/keyring", keyring_path => "/var/lib/ceph/mds/ceph-${facts['networking']['hostname']}/keyring",
secret => $ceph::profile::params::mds_key, secret => $ceph::profile::params::mds_key,
user => 'ceph', user => 'ceph',
group => 'ceph' group => 'ceph',
} -> Service<| tag == 'ceph-mds' |> } -> Service<| tag == 'ceph-mds' |>
} }
} }

2
manifests/profile/mon.pp
View File

@@ -39,7 +39,7 @@ class ceph::profile::mon {
if !empty($ceph::profile::params::client_keys) { if !empty($ceph::profile::params::client_keys) {
class { 'ceph::keys': class { 'ceph::keys':
args => $ceph::profile::params::client_keys, args => $ceph::profile::params::client_keys,
defaults => $defaults defaults => $defaults,
} }
} }
} }

4
manifests/rgw.pp
View File

@@ -180,7 +180,7 @@ define ceph::rgw (
# Log file for radosgw (ownership) # Log file for radosgw (ownership)
file { $log_file: file { $log_file:
ensure => present, ensure => file,
owner => $user_real, owner => $user_real,
mode => '0640', mode => '0640',
selinux_ignore_defaults => true, selinux_ignore_defaults => true,
@@ -194,7 +194,7 @@ define ceph::rgw (
ensure => $rgw_ensure, ensure => $rgw_ensure,
enable => $rgw_enable, enable => $rgw_enable,
name => "ceph-radosgw@${name}", name => "ceph-radosgw@${name}",
tag => ['ceph-radosgw'] tag => ['ceph-radosgw'],
} }
Ceph_config<||> ~> Service<| tag == 'ceph-radosgw' |> Ceph_config<||> ~> Service<| tag == 'ceph-radosgw' |>