Fix with latest rubocop rules

diff --git a/metadata.rb b/metadata.rb
index 10a94dd52fd65e317de63de9bd0b4e1093e9cf97..01e49dc321f5a9732db6e319b9d58f4b7f468133 100644 (file)
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,10 +1,10 @@
-name                    'ceph'
-maintainer              'Kyle Bader'
-maintainer_email        'kyle.bader@dreamhost.com'
-license                 'Apache 2.0'
-description             'Installs/Configures the Ceph distributed filesystem'
-long_description        IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version                        '0.2.1'
+name 'ceph'
+maintainer 'Kyle Bader'
+maintainer_email 'kyle.bader@dreamhost.com'
+license 'Apache 2.0'
+description 'Installs/Configures the Ceph distributed filesystem'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version '0.2.1'
 
 depends        'apache2', '>= 1.1.12'
 depends 'apt'

diff --git a/recipes/osd.rb b/recipes/osd.rb
index 5c35bca641bd22b54b9f7c51eb4ae25d3b510bbd..7fa968c9abc1be74b87a34ee12b79dcce1305205 100644 (file)
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -99,7 +99,7 @@ else
   # osd/$cluster-$id)
   #  - $cluster should always be ceph
   #  - The --dmcrypt option will be available starting w/ Cuttlefish
-  if !node['ceph']['osd_devices'].nil?
+  if node['ceph']['osd_devices']
     devices = node['ceph']['osd_devices']
 
     devices = Hash[(0...devices.size).zip devices] unless devices.kind_of? Hash

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 85e5d6a2d9c4792ba9f005b76f558111b4f4b93c..c576b295c4f84866a3e0c9c2c53ac9a6f99a6093 100644 (file)
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -45,7 +45,7 @@ end
 
 include_recipe 'ceph::conf'
 
-if !::File.exists?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done")
+if !::File.exist?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done")
   if node['ceph']['radosgw']['webserver_companion']
     include_recipe "ceph::radosgw_#{node["ceph"]["radosgw"]["webserver_companion"]}"
   end