Merge pull request redhat-openstack#188 from cloudevelops/consolidate…

…-python-plugin-2

Ensured deprecated file removed

manifests/plugin/python.pp

@@ -4,19 +4,27 @@
   $module,
   $script_source,
   $config = {},
+  $order = '10',
 ) {
   include collectd::params
 
   validate_hash($config)
 
   $conf_dir = $collectd::params::plugin_conf_dir
 
+  # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese
+  file { "${name}.load-deprecated":
+    path => "${conf_dir}/${name}.conf",
+    ensure => absent,
+  }
+  # End deprecation
+
   file {
     "${name}.load":
-      path    => "${conf_dir}/${name}.conf",
+      path    => "${conf_dir}/${order}-${name}.conf",
       owner   => 'root',
       group   => $collectd::params::root_group,
-      mode    => '0644',
+      mode    => '0640',
       content => template('collectd/python.conf.erb'),
       notify  => Service['collectd'],
   }
@@ -26,7 +34,7 @@
       path    => "${modulepath}/${module}.py",
       owner   => 'root',
       group   => $collectd::params::root_group,
-      mode    => '0644',
+      mode    => '0640',
       source  => $script_source,
       require => File["${name}.load"],
       notify  => Service['collectd'],