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

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 828674ad7d452be4f525b1b5776e39b45ca9e60b..3b10c8feb8bfc93c889c90544a45f02002bd8000 100644 (file)
--- 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 b8ba7e0d0495dea5ba541c08dee7afde853e5ecc..734ce95143c25298cc2612b0d6705a6816e1bca1 100644 (file)
--- 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',
     }