Prepare for new lint plugins

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: If576b350a70db6f70282632bed39649fcf6af4c9
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manifests/api.pp

@@ -69,7 +69,7 @@ class cloudkitty::api (
 
   package { 'cloudkitty-api':
     ensure => $package_ensure,
-    name   => $::cloudkitty::params::api_package_name,
+    name   => $cloudkitty::params::api_package_name,
     tag    => ['openstack', 'cloudkitty-package'],
   }
 
@@ -84,7 +84,7 @@ class cloudkitty::api (
       $service_ensure = 'stopped'
     }
 
-    if $service_name == $::cloudkitty::params::api_service_name {
+    if $service_name == $cloudkitty::params::api_service_name {
       service { 'cloudkitty-api':
         enable     => $enabled,
         name       => 'cloudkitty-api',
@@ -95,7 +95,7 @@ class cloudkitty::api (
     } elsif $service_name == 'httpd' {
       service { 'cloudkitty-api':
         ensure => 'stopped',
-        name   => $::cloudkitty::params::api_service_name,
+        name   => $cloudkitty::params::api_service_name,
         enable => false,
         tag    => 'cloudkitty-service',
       }

manifests/client.pp

@@ -17,7 +17,7 @@ class cloudkitty::client (
 
   package { 'python-cloudkittyclient':
     ensure => $ensure,
-    name   => $::cloudkitty::params::client_package_name,
+    name   => $cloudkitty::params::client_package_name,
     tag    => 'openstack',
   }
 

manifests/db/sync.pp

@@ -23,7 +23,7 @@ class cloudkitty::db::sync(
   exec { 'cloudkitty-db-sync':
     command     => "cloudkitty-dbsync upgrade ${extra_params}",
     path        => [ '/bin', '/usr/bin', ],
-    user        => $::cloudkitty::params::user,
+    user        => $cloudkitty::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,

manifests/init.pp

@@ -278,7 +278,7 @@ class cloudkitty(
 
   package { 'cloudkitty-common':
     ensure => $package_ensure,
-    name   => $::cloudkitty::params::common_package_name,
+    name   => $cloudkitty::params::common_package_name,
     tag    => ['openstack','cloudkitty-package'],
   }
 
@@ -350,13 +350,13 @@ class cloudkitty(
   }
 
   if $metrics_config {
-    file {'metrics.yml':
-      ensure  => present,
-      path    => $::cloudkitty::params::metrics_yaml,
+    file { 'metrics.yml':
+      ensure  => file,
+      path    => $cloudkitty::params::metrics_yaml,
       content => stdlib::to_yaml($metrics_config),
       mode    => '0640',
       owner   => 'root',
-      group   => $::cloudkitty::params::group,
+      group   => $cloudkitty::params::group,
       tag     => 'cloudkitty-yamls',
     }
   }

manifests/policy.pp

@@ -62,7 +62,7 @@ class cloudkitty::policy (
     policies     => $policies,
     policy_path  => $policy_path,
     file_user    => 'root',
-    file_group   => $::cloudkitty::params::group,
+    file_group   => $cloudkitty::params::group,
     file_format  => 'yaml',
     purge_config => $purge_config,
     tag          => 'cloudkitty',

manifests/processor.pp

@@ -72,7 +72,7 @@ class cloudkitty::processor (
 
   package { 'cloudkitty-processor':
     ensure => $package_ensure,
-    name   => $::cloudkitty::params::processor_package_name,
+    name   => $cloudkitty::params::processor_package_name,
     tag    => ['openstack', 'cloudkitty-package'],
   }
 
@@ -85,7 +85,7 @@ class cloudkitty::processor (
 
     service { 'cloudkitty-processor':
       ensure     => $service_ensure,
-      name       => $::cloudkitty::params::processor_service_name,
+      name       => $cloudkitty::params::processor_service_name,
       enable     => $enabled,
       hasstatus  => true,
       hasrestart => true,

manifests/storage.pp

@@ -18,7 +18,7 @@ class cloudkitty::storage(
   exec { 'cloudkitty-storage-init':
     command     => "cloudkitty-storage-init ${extra_params}",
     path        => '/usr/bin',
-    user        => $::cloudkitty::params::user,
+    user        => $cloudkitty::params::user,
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,

manifests/wsgi/apache.pp

@@ -157,7 +157,7 @@ class cloudkitty::wsgi::apache (
   openstacklib::wsgi::apache { 'cloudkitty_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
-    group                       => $::cloudkitty::params::group,
+    group                       => $cloudkitty::params::group,
     path                        => $path,
     priority                    => $priority,
     servername                  => $servername,
@@ -170,14 +170,14 @@ class cloudkitty::wsgi::apache (
     ssl_crl_path                => $ssl_crl_path,
     ssl_key                     => $ssl_key,
     threads                     => $threads,
-    user                        => $::cloudkitty::params::user,
+    user                        => $cloudkitty::params::user,
     workers                     => $workers,
     wsgi_daemon_process         => 'cloudkitty',
     wsgi_process_display_name   => $wsgi_process_display_name,
     wsgi_process_group          => 'cloudkitty',
-    wsgi_script_dir             => $::cloudkitty::params::cloudkitty_wsgi_script_path,
+    wsgi_script_dir             => $cloudkitty::params::cloudkitty_wsgi_script_path,
     wsgi_script_file            => 'app',
-    wsgi_script_source          => $::cloudkitty::params::cloudkitty_wsgi_script_source,
+    wsgi_script_source          => $cloudkitty::params::cloudkitty_wsgi_script_source,
     headers                     => $headers,
     request_headers             => $request_headers,
     custom_wsgi_process_options => $custom_wsgi_process_options,

spec/classes/cloudkitty_init_spec.rb

@@ -194,7 +194,7 @@ describe 'cloudkitty' do
 
       it 'configures metrics.yml' do
         is_expected.to contain_file('metrics.yml').with(
-          :ensure => 'present',
+          :ensure => 'file',
           :path   => '/etc/cloudkitty/metrics.yml',
           :mode   => '0640',
           :owner  => 'root',