From: Guilhem Lettron <guilhem.lettron@gmail.com>
Date: Fri, 2 May 2014 12:09:33 +0000 (+0200)
Subject: Fix rubocop
X-Git-Tag: v0.8.0~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1dbbe729894c3fc5ac32bbf76344133946f19fdd;p=ceph-cookbooks.git

Fix rubocop
---

diff --git a/libraries/default.rb b/libraries/default.rb
index b6ddecd..142b314 100644
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -31,7 +31,7 @@ end
 def find_node_ip_in_network(network, nodeish = nil)
   nodeish = node unless nodeish
   net = IPAddr.new(network)
-  nodeish['network']['interfaces'].each do |iface, addrs|
+  nodeish['network']['interfaces'].each do |_iface, addrs|
     addresses = addrs['addresses'] || []
     addresses.each do |ip, params|
       return ip_address_to_ceph_address(ip, params) if ip_address_in_network?(ip, params, net)
diff --git a/providers/client.rb b/providers/client.rb
index e176365..d2154d3 100644
--- a/providers/client.rb
+++ b/providers/client.rb
@@ -35,7 +35,7 @@ def load_current_resource
   @current_resource.as_keyring(@new_resource.as_keyring)
   @current_resource.keyname(@new_resource.keyname || "client.#{current_resource.name}.#{node['hostname']}")
   @current_resource.caps(get_caps(@current_resource.keyname))
-  default_filename = "/etc/ceph/ceph.client.#{@new_resource.name}.#{node['hostname']}.#{@new_resource.as_keyring ? "keyring" : "secret"}"
+  default_filename = "/etc/ceph/ceph.client.#{@new_resource.name}.#{node['hostname']}.#{@new_resource.as_keyring ? 'keyring' : 'secret'}"
   @current_resource.filename(@new_resource.filename || default_filename)
   @current_resource.key = get_key(@current_resource.keyname)
   @current_resource.caps_match = true if @current_resource.caps == @new_resource.caps
diff --git a/recipes/mds.rb b/recipes/mds.rb
index 699c938..0111135 100644
--- a/recipes/mds.rb
+++ b/recipes/mds.rb
@@ -22,7 +22,7 @@ include_recipe 'ceph::conf'
 
 cluster = 'ceph'
 
-directory "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}" do
+directory "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}" do
   owner 'root'
   group 'root'
   mode 00755
@@ -36,7 +36,7 @@ ceph_client 'mds' do
   filename "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/keyring"
 end
 
-file "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}/done" do
+file "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/done" do
   owner 'root'
   group 'root'
   mode 00644
@@ -50,7 +50,7 @@ when 'upstart'
 else
   filename = 'sysvinit'
 end
-file "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}/#{filename}" do
+file "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/#{filename}" do
   owner 'root'
   group 'root'
   mode 00644
diff --git a/recipes/mon.rb b/recipes/mon.rb
index 489ddb3..69dfb64 100644
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -29,7 +29,7 @@ directory '/var/run/ceph' do
   action :create
 end
 
-directory "/var/lib/ceph/mon/ceph-#{node["hostname"]}" do
+directory "/var/lib/ceph/mon/ceph-#{node['hostname']}" do
   owner 'root'
   group 'root'
   mode 00755
@@ -40,7 +40,7 @@ end
 # TODO: cluster name
 cluster = 'ceph'
 
-unless File.exist?("/var/lib/ceph/mon/ceph-#{node["hostname"]}/done")
+unless File.exist?("/var/lib/ceph/mon/ceph-#{node['hostname']}/done")
   keyring = "#{Chef::Config[:file_cache_path]}/#{cluster}-#{node['hostname']}.mon.keyring"
 
   if node['ceph']['encrypted_data_bags']
@@ -62,7 +62,7 @@ unless File.exist?("/var/lib/ceph/mon/ceph-#{node["hostname"]}/done")
   ruby_block 'finalise' do
     block do
       ['done', service_type].each do |ack|
-        ::File.open("/var/lib/ceph/mon/ceph-#{node["hostname"]}/#{ack}", 'w').close
+        ::File.open("/var/lib/ceph/mon/ceph-#{node['hostname']}/#{ack}", 'w').close
       end
     end
   end
diff --git a/recipes/osd.rb b/recipes/osd.rb
index a0e8506..dd20e69 100644
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -76,7 +76,7 @@ execute 'format as keyring' do
 end
 
 if crowbar?
-  node['crowbar']['disks'].each do |disk, data|
+  node['crowbar']['disks'].each do |disk, _data|
     execute "ceph-disk-prepare #{disk}" do
       command "ceph-disk-prepare /dev/#{disk}"
       only_if { node['crowbar']['disks'][disk]['usage'] == 'Storage' }
diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index c576b29..4c86cc7 100644
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -47,7 +47,7 @@ include_recipe 'ceph::conf'
 
 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"]}"
+    include_recipe "ceph::radosgw_#{node['ceph']['radosgw']['webserver_companion']}"
   end
 
   ceph_client 'radosgw' do