From 8ac9135920cd0cca41e3b70ceae33ae63211785a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 20 Feb 2022 18:57:46 +0900
Subject: [PATCH] Fix missing mode/owner/group enforcement of polling.yaml
... and avoid hard-coding user/group but use the definition in
the params class.
Change-Id: Ia5f1e356902ad544fe7eb17e53b3b274475d40a8
---
manifests/agent/notification.pp | 4 ++--
manifests/agent/polling.pp | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 828674ad..3b10c8fe 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -156,7 +156,7 @@ class ceilometer::agent::notification (
selinux_ignore_defaults => true,
mode => '0640',
owner => 'root',
- group => 'ceilometer',
+ group => $::ceilometer::params::group,
tag => 'ceilometer-yamls',
}
}
@@ -177,7 +177,7 @@ class ceilometer::agent::notification (
selinux_ignore_defaults => true,
mode => '0640',
owner => 'root',
- group => 'ceilometer',
+ group => $::ceilometer::params::group,
tag => 'ceilometer-yamls',
}
}
diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index b8ba7e0d..734ce951 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -186,6 +186,9 @@ class ceilometer::agent::polling (
ensure => present,
path => $::ceilometer::params::polling,
content => $polling_content,
+ mode => '0640',
+ owner => 'root',
+ group => $::ceilometer::params::group,
selinux_ignore_defaults => true,
tag => 'ceilometer-yamls',
}