diff --git a/examples/site.pp b/examples/site.pp
index b979aea9..86deef7c 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -1,13 +1,9 @@
 node default {
-  Exec {
-    path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin']
-  }
-
   # Add the base ceilometer class & parameters
   # This class is required by ceilometer agents & api classes
   # The telemetry_secret parameter is mandatory
   class { 'ceilometer':
-    telemetry_secret => 'darksecret'
+    telemetry_secret => 'darksecret',
   }
 
   class { 'ceilometer::db::sync': }
@@ -19,7 +15,7 @@ node default {
   # Set common auth parameters used by all agents (compute/central)
   class { 'ceilometer::agent::service_credentials':
     auth_url => 'http://localhost:5000/v3',
-    password => 'a_big_secret'
+    password => 'a_big_secret',
   }
 
   # Install polling agent
diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index b05dea25..e816f11f 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -128,8 +128,8 @@ class ceilometer::agent::notification (
 
   package { 'ceilometer-notification':
     ensure => $package_ensure,
-    name   => $::ceilometer::params::agent_notification_package_name,
-    tag    => ['openstack', 'ceilometer-package']
+    name   => $ceilometer::params::agent_notification_package_name,
+    tag    => ['openstack', 'ceilometer-package'],
   }
 
   if $manage_service {
@@ -141,11 +141,11 @@ class ceilometer::agent::notification (
 
     service { 'ceilometer-agent-notification':
       ensure     => $service_ensure,
-      name       => $::ceilometer::params::agent_notification_service_name,
+      name       => $ceilometer::params::agent_notification_service_name,
       enable     => $enabled,
       hasstatus  => true,
       hasrestart => true,
-      tag        => 'ceilometer-service'
+      tag        => 'ceilometer-service',
     }
   }
 
@@ -157,17 +157,17 @@ class ceilometer::agent::notification (
     }
 
     file { 'event_pipeline':
-      ensure  => present,
-      path    => $::ceilometer::params::event_pipeline,
+      ensure  => file,
+      path    => $ceilometer::params::event_pipeline,
       content => $event_pipeline_content,
       mode    => '0640',
       owner   => 'root',
-      group   => $::ceilometer::params::group,
+      group   => $ceilometer::params::group,
       tag     => 'ceilometer-yamls',
     }
 
     ceilometer_config {
-      'DEFAULT/event_pipeline_cfg_file': value => $::ceilometer::params::event_pipeline;
+      'DEFAULT/event_pipeline_cfg_file': value => $ceilometer::params::event_pipeline;
     }
   } else {
     ceilometer_config {
@@ -183,17 +183,17 @@ class ceilometer::agent::notification (
     }
 
     file { 'pipeline':
-      ensure  => present,
-      path    => $::ceilometer::params::pipeline,
+      ensure  => file,
+      path    => $ceilometer::params::pipeline,
       content => $pipeline_content,
       mode    => '0640',
       owner   => 'root',
-      group   => $::ceilometer::params::group,
+      group   => $ceilometer::params::group,
       tag     => 'ceilometer-yamls',
     }
 
     ceilometer_config {
-      'DEFAULT/pipeline_cfg_file': value => $::ceilometer::params::pipeline;
+      'DEFAULT/pipeline_cfg_file': value => $ceilometer::params::pipeline;
     }
   } else {
     ceilometer_config {
diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 64bc0d76..8ccc6102 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -66,7 +66,7 @@
 # [*polling_meters*]
 #   (Optional) Array of strings with meters to add to
 #   the polling.yaml file, used only if manage_polling is true.
-#   Defaults to $::ceilometer::params::polling_meters
+#   Defaults to $ceilometer::params::polling_meters
 #
 # [*polling_config*]
 #   (Optional) A hash of the polling.yaml configuration.
@@ -143,7 +143,7 @@ class ceilometer::agent::polling (
   $resource_cache_expiry           = $facts['os_service_default'],
   Boolean $manage_polling          = false,
   $polling_interval                = 300,
-  Array[String[1]] $polling_meters = $::ceilometer::params::polling_meters,
+  Array[String[1]] $polling_meters = $ceilometer::params::polling_meters,
   Optional[Hash] $polling_config   = undef,
   $cfg_file                        = $facts['os_service_default'],
   $batch_size                      = $facts['os_service_default'],
@@ -184,7 +184,7 @@ Use the identity_name_discovery parameter instead.")
       # the ceilometer user can access libvirt to gather some metrics.
       $ceilometer_groups = delete_undef_values([
         'nova',
-        $::ceilometer::params::libvirt_group
+        $ceilometer::params::libvirt_group,
       ])
 
       user { 'ceilometer':
@@ -196,7 +196,7 @@ Use the identity_name_discovery parameter instead.")
         before  => Anchor['ceilometer::service::begin'],
       }
 
-      if $::ceilometer::params::libvirt_group {
+      if $ceilometer::params::libvirt_group {
         Package <| title == 'libvirt' |> -> User['ceilometer']
       }
       Package <| title == 'nova-common' |> -> User['ceilometer']
@@ -229,7 +229,7 @@ Use the identity_name_discovery parameter instead.")
     if $central_namespace {
       package { 'ceilometer-central':
         ensure => $package_ensure,
-        name   =>  $::ceilometer::params::agent_central_package_name,
+        name   => $ceilometer::params::agent_central_package_name,
         tag    => ['openstack', 'ceilometer-package'],
       }
     }
@@ -237,7 +237,7 @@ Use the identity_name_discovery parameter instead.")
     if $compute_namespace {
       package { 'ceilometer-compute':
         ensure => $package_ensure,
-        name   =>  $::ceilometer::params::agent_compute_package_name,
+        name   => $ceilometer::params::agent_compute_package_name,
         tag    => ['openstack', 'ceilometer-package'],
       }
     }
@@ -245,7 +245,7 @@ Use the identity_name_discovery parameter instead.")
     if $ipmi_namespace {
       package { 'ceilometer-ipmi':
         ensure => $package_ensure,
-        name   =>  $::ceilometer::params::agent_ipmi_package_name,
+        name   => $ceilometer::params::agent_ipmi_package_name,
         tag    => ['openstack', 'ceilometer-package'],
       }
     }
@@ -253,7 +253,7 @@ Use the identity_name_discovery parameter instead.")
   } else {
     package { 'ceilometer-polling':
       ensure => $package_ensure,
-      name   => $::ceilometer::params::agent_polling_package_name,
+      name   => $ceilometer::params::agent_polling_package_name,
       tag    => ['openstack', 'ceilometer-package'],
     }
   }
@@ -261,16 +261,16 @@ Use the identity_name_discovery parameter instead.")
   $namespaces_real = delete_undef_values([
     $central_namespace_name,
     $compute_namespace_name,
-    $ipmi_namespace_name
+    $ipmi_namespace_name,
   ])
 
   if empty($namespaces_real) or $separate_services {
     ceilometer_config {
-      'DEFAULT/polling_namespaces': ensure => absent
+      'DEFAULT/polling_namespaces': ensure => absent;
     }
   } else {
     ceilometer_config {
-      'DEFAULT/polling_namespaces': value => join($namespaces_real, ',')
+      'DEFAULT/polling_namespaces': value => join($namespaces_real, ',');
     }
   }
 
@@ -298,7 +298,7 @@ Use the identity_name_discovery parameter instead.")
       if $central_namespace {
         service { 'ceilometer-central':
           ensure     => $service_ensure,
-          name       => $::ceilometer::params::agent_central_service_name,
+          name       => $ceilometer::params::agent_central_service_name,
           enable     => $enabled,
           hasstatus  => true,
           hasrestart => true,
@@ -308,7 +308,7 @@ Use the identity_name_discovery parameter instead.")
       if $compute_namespace {
         service { 'ceilometer-compute':
           ensure     => $service_ensure,
-          name       => $::ceilometer::params::agent_compute_service_name,
+          name       => $ceilometer::params::agent_compute_service_name,
           enable     => $enabled,
           hasstatus  => true,
           hasrestart => true,
@@ -318,7 +318,7 @@ Use the identity_name_discovery parameter instead.")
       if $ipmi_namespace {
         service { 'ceilometer-ipmi':
           ensure     => $service_ensure,
-          name       => $::ceilometer::params::agent_ipmi_service_name,
+          name       => $ceilometer::params::agent_ipmi_service_name,
           enable     => $enabled,
           hasstatus  => true,
           hasrestart => true,
@@ -328,7 +328,7 @@ Use the identity_name_discovery parameter instead.")
     } else {
       service { 'ceilometer-polling':
         ensure     => $service_ensure,
-        name       => $::ceilometer::params::agent_polling_service_name,
+        name       => $ceilometer::params::agent_polling_service_name,
         enable     => $enabled,
         hasstatus  => true,
         hasrestart => true,
@@ -345,17 +345,17 @@ Use the identity_name_discovery parameter instead.")
     }
 
     file { 'polling':
-      ensure  => present,
-      path    => $::ceilometer::params::polling,
+      ensure  => file,
+      path    => $ceilometer::params::polling,
       content => $polling_content,
       mode    => '0640',
       owner   => 'root',
-      group   => $::ceilometer::params::group,
+      group   => $ceilometer::params::group,
       tag     => 'ceilometer-yamls',
     }
 
     ceilometer_config {
-      'polling/cfg_file': value => $::ceilometer::params::polling;
+      'polling/cfg_file': value => $ceilometer::params::polling;
     }
   } else {
     ceilometer_config {
diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index 3d3e287c..1a5a9026 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -15,7 +15,7 @@ class ceilometer::coordination (
   include ceilometer::deps
 
   oslo::coordination{ 'ceilometer_config':
-    backend_url => $backend_url
+    backend_url => $backend_url,
   }
 
   # all coordination settings should be applied and all packages should be
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index ad8ef89e..ce3c82f6 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -32,9 +32,9 @@ class ceilometer::db::sync(
   }
 
   exec { 'ceilometer-upgrade':
-    command     => "${::ceilometer::params::dbsync_command} ${skip_opt}${extra_params}",
+    command     => "${ceilometer::params::dbsync_command} ${skip_opt}${extra_params}",
     path        => '/usr/bin',
-    user        => $::ceilometer::params::user,
+    user        => $ceilometer::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,
diff --git a/manifests/init.pp b/manifests/init.pp
index b45083ba..d25d26cb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -245,7 +245,7 @@ class ceilometer(
 
   package { 'ceilometer-common':
     ensure => $package_ensure,
-    name   => $::ceilometer::params::common_package_name,
+    name   => $ceilometer::params::common_package_name,
     tag    => ['openstack', 'ceilometer-package'],
   }
 
diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index 2800c614..82eead35 100644
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -112,10 +112,11 @@ describe 'ceilometer::agent::notification' do
       ) }
 
       it { is_expected.to contain_file('event_pipeline').with(
-        'path'  => '/etc/ceilometer/event_pipeline.yaml',
-        'owner' => 'root',
-        'group' => 'ceilometer',
-        'mode'  => '0640',
+        :ensure => 'file',
+        :path   => '/etc/ceilometer/event_pipeline.yaml',
+        :owner  => 'root',
+        :group  => 'ceilometer',
+        :mode   => '0640',
       ) }
 
       it { 'configures event_pipeline with the default notifier'
@@ -176,7 +177,12 @@ describe 'ceilometer::agent::notification' do
       )}
 
       it { should contain_file('event_pipeline').with(
-        :content                 => '---
+        :ensure  => 'file',
+        :path    => '/etc/ceilometer/event_pipeline.yaml',
+        :owner   => 'root',
+        :group   => 'ceilometer',
+        :mode    => '0640',
+        :content => '---
 sources:
 - name: my_event_source
   events:
@@ -206,10 +212,11 @@ sinks:
       ) }
 
       it { is_expected.to contain_file('pipeline').with(
-        'path' => '/etc/ceilometer/pipeline.yaml',
-        'mode'  => '0640',
-        'owner' => 'root',
-        'group' => 'ceilometer',
+        :ensure => 'file',
+        :path   => '/etc/ceilometer/pipeline.yaml',
+        :mode   => '0640',
+        :owner  => 'root',
+        :group  => 'ceilometer',
       ) }
       it { is_expected.to contain_ceilometer_config('DEFAULT/pipeline_cfg_file').with_value('/etc/ceilometer/pipeline.yaml') }
     end
@@ -231,7 +238,12 @@ sinks:
       )}
 
       it { should contain_file('pipeline').with(
-        :content                 => '---
+        :ensure  => 'file',
+        :path    => '/etc/ceilometer/pipeline.yaml',
+        :mode    => '0640',
+        :owner   => 'root',
+        :group   => 'ceilometer',
+        :content => '---
 sources:
 - name: my_source
   meters:
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index fba2607d..634e69e4 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -218,7 +218,7 @@ describe 'ceilometer::agent::polling' do
      end
 
       it { should contain_file('polling').with(
-        :ensure  => 'present',
+        :ensure  => 'file',
         :path    => '/etc/ceilometer/polling.yaml',
         :content => '---
 sources:
@@ -252,7 +252,7 @@ sources:
       end
 
       it { should contain_file('polling').with(
-        :ensure  => 'present',
+        :ensure  => 'file',
         :path    => '/etc/ceilometer/polling.yaml',
         :content => '---
 sources:
@@ -283,7 +283,7 @@ sources:
       end
 
       it { should contain_file('polling').with(
-        :ensure  => 'present',
+        :ensure  => 'file',
         :path    => '/etc/ceilometer/polling.yaml',
         :content => '---
 sources: