From 0a617642e31a3d20db81896dfbc5b54b6678062d Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Sat, 5 Apr 2014 15:50:15 +0200 Subject: [PATCH] Fix with latest rubocop rules --- metadata.rb | 14 +++++++------- recipes/osd.rb | 2 +- recipes/radosgw.rb | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/metadata.rb b/metadata.rb index 10a94dd..01e49dc 100644 --- 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 5c35bca..7fa968c 100644 --- 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 85e5d6a..c576b29 100644 --- 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 -- 2.47.3