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

manifests/auth_file.pp

@@ -143,11 +143,12 @@ class openstack_extras::auth_file (
 ) {
 
   file { $path:
+    ensure    => file,
     owner     => 'root',
     group     => 'root',
     mode      => '0700',
     show_diff => false,
     tag       => ['openrc'],
-    content   => template('openstack_extras/openrc.erb')
+    content   => template('openstack_extras/openrc.erb'),
   }
 }

manifests/repo/redhat/redhat.pp

@@ -119,13 +119,13 @@ class openstack_extras::repo::redhat::redhat (
         'descr'           => "OpenStack ${release_cap} Repository",
         'gpgkey'          => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
         'module_hotfixes' => true,
-      }
+      },
     }
 
     $rdokey_hash = {
       '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud' => {
-        'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Cloud'
+        'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Cloud',
-      }
+      },
     }
 
     create_resources('file', $rdokey_hash, $_gpgkey_defaults)
@@ -140,14 +140,14 @@ class openstack_extras::repo::redhat::redhat (
         'metalink'       => "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch",
         'descr'          => "Extra Packages for Enterprise Linux ${facts['os']['release']['major']} - \$basearch",
         'gpgkey'         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${facts['os']['release']['major']}",
-        'failovermethod' => 'priority'
+        'failovermethod' => 'priority',
-      }
+      },
     }
 
     $epelkey_hash = {
       "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${facts['os']['release']['major']}" => {
-        'source' => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-${facts['os']['release']['major']}"
+        'source' => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-${facts['os']['release']['major']}",
-      }
+      },
     }
 
     create_resources('file', $epelkey_hash, $_gpgkey_defaults)
@@ -159,6 +159,7 @@ class openstack_extras::repo::redhat::redhat (
 
   $repo_source_hash.each |$filename, $url| {
     file { $filename:
+      ensure  => file,
       path    => "/etc/yum.repos.d/${filename}",
       source  => $url,
       replace => $repo_replace,
@@ -168,7 +169,7 @@ class openstack_extras::repo::redhat::redhat (
 
   if $purge_unmanaged {
     resources { 'yumrepo':
-      purge => true
+      purge => true,
     }
   }
 

spec/classes/openstack_extras_auth_file_spec.rb

@@ -10,6 +10,7 @@ describe 'openstack_extras::auth_file' do
       end
 
       it { is_expected.to contain_file('/root/openrc').with(
+        :ensure    => 'file',
         :owner     => 'root',
         :group     => 'root',
         :mode      => '0700',
@@ -72,6 +73,7 @@ describe 'openstack_extras::auth_file' do
       end
 
       it { is_expected.to contain_file('/path/to/file').with(
+        :ensure    => 'file',
         :owner     => 'root',
         :group     => 'root',
         :mode      => '0700',

spec/classes/openstack_extras_repo_redhat_redhat_spec.rb

@@ -274,6 +274,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_file('delorean.repo').with(
+        :ensure  => 'file',
         :path    => '/etc/yum.repos.d/delorean.repo',
         :source  => 'https://trunk.rdoproject.org/centos/puppet-passed-ci/delorean.repo',
         :replace => true,
@@ -281,6 +282,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       )}
 
       it { should contain_file('delorean-deps.repo').with(
+        :ensure  => 'file',
         :path    => '/etc/yum.repos.d/delorean-deps.repo',
         :source  => 'https://trunk.rdoproject.org/centos/delorean-deps.repo',
         :replace => true,
@@ -299,6 +301,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_file('thing.repo').with(
+        :ensure  => 'file',
         :path    => '/etc/yum.repos.d/thing.repo',
         :source  => 'https://trunk.rdoproject.org/some/thing.repo',
         :replace => false,