Fix all rubocop

Use rake instead of strainer
add infrastructure file for spiceweasel

diff --git a/.rubocop.yml b/.rubocop.yml
index 1ebbd9a3e6a7998d8f5f97295aa4848bbba3454a..21ecf52338ee188730cb29b6e4557acd1d874fcb 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,16 +1,28 @@
 AllCops:
+  Includes:
+    - Berksfile
+    - Gemfile
+    - Rakefile
+    - Thorfile
+    - Guardfile
   Excludes:
     - vendor/**
 
-AlignParameters:
+ClassLength:
+  Enabled: false
+Documentation:
   Enabled: false
 Encoding:
   Enabled: false
 HashSyntax:
   Enabled: false
-StringLiterals:
-  Enabled: false
 LineLength:
   Enabled: false
 MethodLength:
-  Max: 30
+  Enabled: false
+SignalException:
+  Enabled: false
+TrailingComma:
+  Enabled: false
+WordArray:
+  Enabled: false

diff --git a/.travis.yml b/.travis.yml
index 67dc1136991b91a5dcb9187a5d36596a4cf88992..7d2bad2d93f9f097c154b113c597b99007ba4532 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
+language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-before_script:
-    - bundle exec berks install
 bundler_args: --without integration
 script:
-  - bundle exec strainer test --except kitchen
+  - bundle exec rake travis

diff --git a/Gemfile b/Gemfile
index 43b894710ec29e0cc78f16fff1344b78180e4e6c..54e4a7ba338fd1d7ea6fdccc26d89bd33a25174b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "chef", "~> 11"
-gem "berkshelf", "~> 2.0.10"
+gem 'chef', '~> 11'
+gem 'berkshelf', '~> 2.0.10'
 
 group :test do
-  gem "chefspec", "~> 3.0.2"
-  gem "foodcritic", "~> 3.0.3"
-  gem "strainer"
-  gem "rubocop"
+  gem 'foodcritic', '~> 3.0'
+  gem 'rubocop'
 end
 
 group :integration do
-  gem "test-kitchen", "~> 1.1.1"
-  gem "kitchen-vagrant", "~> 0.14"
+  gem 'test-kitchen', '~> 1.1.1'
+  gem 'kitchen-vagrant', '~> 0.14'
 end

diff --git a/Rakefile b/Rakefile
new file mode 100644 (file)
index 0000000..9fe7e48
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,47 @@
+#!/usr/bin/env rake
+
+# Style tests. Rubocop and Foodcritic
+namespace :style do
+  begin
+    require 'rubocop/rake_task'
+    desc 'Run Ruby style checks'
+    Rubocop::RakeTask.new(:ruby)
+  rescue LoadError
+    puts '>>>>> Rubocop gem not loaded, omitting tasks' unless ENV['CI']
+  end
+
+  begin
+    require 'foodcritic'
+
+    desc 'Run Chef style checks'
+    FoodCritic::Rake::LintTask.new(:chef) do |t|
+      t.options = {
+        fail_tags: ['any'],
+        tags: ['~FC003']
+      }
+    end
+  rescue LoadError
+    puts '>>>>> foodcritic gem not loaded, omitting tasks' unless ENV['CI']
+  end
+end
+
+desc 'Run all style checks'
+task style: ['style:chef', 'style:ruby']
+
+# Integration tests. Kitchen.ci
+namespace :integration do
+  begin
+    require 'kitchen/rake_tasks'
+
+    desc 'Run kitchen integration tests'
+    Kitchen::RakeTasks.new
+  rescue LoadError
+    puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
+  end
+end
+
+desc 'Run all tests on Travis'
+task travis: ['style']
+
+# Default
+task default: ['style', 'integration:kitchen:all']

diff --git a/Strainerfile b/Strainerfile
deleted file mode 100644 (file)
index 166bb96..0000000
--- a/Strainerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Strainerfile
-rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK
-knife test: bundle exec knife cookbook test $COOKBOOK
-foodcritic: bundle exec foodcritic -f any -t ~FC003 $SANDBOX/$COOKBOOK
-#chefspec: bundle exec rspec $SANDBOX/$COOKBOOK/spec

diff --git a/attributes/cephfs.rb b/attributes/cephfs.rb
index 114752804ec93079dc8e52ba3d3382a4d86af364..1043a477b828ca1d596b94663e7c0c7e4088f19f 100644 (file)
--- a/attributes/cephfs.rb
+++ b/attributes/cephfs.rb
@@ -1 +1 @@
-default["ceph"]["cephfs_mount"] = "/ceph"
+default['ceph']['cephfs_mount'] = '/ceph'

diff --git a/attributes/conf.rb b/attributes/conf.rb
index 27bef9e13d6586ebbd27b579b896affd564859d9..a2045c6c79555cac02717331cfc71eb092d393ef 100644 (file)
--- a/attributes/conf.rb
+++ b/attributes/conf.rb
@@ -1,2 +1,2 @@
-default["ceph"]["config"] = {}
-default["ceph"]["config-sections"] = {}
+default['ceph']['config'] = {}
+default['ceph']['config-sections'] = {}

diff --git a/attributes/mds.rb b/attributes/mds.rb
index be0c008ef27c7bfe8766b4a6d98cf610a34aaeef..8ab64d831f6b036579c6422f0dd15257b6ce0b3a 100644 (file)
--- a/attributes/mds.rb
+++ b/attributes/mds.rb
@@ -1,6 +1,6 @@
 case node['platform']
 when 'ubuntu'
-  default["ceph"]["mds"]["init_style"] = "upstart"
+  default['ceph']['mds']['init_style'] = 'upstart'
 else
-  default["ceph"]["mds"]["init_style"] = "sysvinit"
+  default['ceph']['mds']['init_style'] = 'sysvinit'
 end

diff --git a/attributes/mon.rb b/attributes/mon.rb
index 629ccbd540302c085885ab702e6d9c6b0c150145..6fad683683db70258df0b448539fbf3ea03b5af8 100644 (file)
--- a/attributes/mon.rb
+++ b/attributes/mon.rb
@@ -1,7 +1,7 @@
 case node['platform']
 when 'ubuntu'
-  default["ceph"]["mon"]["init_style"] = "upstart"
+  default['ceph']['mon']['init_style'] = 'upstart'
 else
-  default["ceph"]["mon"]["init_style"] = "sysvinit"
+  default['ceph']['mon']['init_style'] = 'sysvinit'
 end
-default["ceph"]["mon"]["secret_file"] = "/etc/chef/secrets/ceph_mon"
+default['ceph']['mon']['secret_file'] = '/etc/chef/secrets/ceph_mon'

diff --git a/attributes/osd.rb b/attributes/osd.rb
index f33196395709621da214a81c3f08eda1ed26a0ea..48f32d28bb7181d95da92ce358ce5d19d59bb8b0 100644 (file)
--- a/attributes/osd.rb
+++ b/attributes/osd.rb
@@ -1,7 +1,7 @@
 case node['platform']
 when 'ubuntu'
-  default["ceph"]["osd"]["init_style"] = "upstart"
+  default['ceph']['osd']['init_style'] = 'upstart'
 else
-  default["ceph"]["osd"]["init_style"] = "sysvinit"
+  default['ceph']['osd']['init_style'] = 'sysvinit'
 end
-default["ceph"]["osd"]["secret_file"] = "/etc/chef/secrets/ceph_osd"
+default['ceph']['osd']['secret_file'] = '/etc/chef/secrets/ceph_osd'

diff --git a/attributes/radosgw.rb b/attributes/radosgw.rb
index 5fb31718e26cff2a74082447eda467dd26c6beb8..9fa751793af1b9e1489d21666584adb2f5a71bcd 100644 (file)
--- a/attributes/radosgw.rb
+++ b/attributes/radosgw.rb
@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-default["ceph"]["radosgw"]["api_fqdn"] = "localhost"
-default["ceph"]["radosgw"]["admin_email"] = "admin@example.com"
-default["ceph"]["radosgw"]["rgw_addr"] = "*:80"
-default["ceph"]["radosgw"]["rgw_port"] = false
-default["ceph"]["radosgw"]["webserver_companion"] = "apache2" # can be false
-default['ceph']["radosgw"]['use_apache_fork'] = true
+default['ceph']['radosgw']['api_fqdn'] = 'localhost'
+default['ceph']['radosgw']['admin_email'] = 'admin@example.com'
+default['ceph']['radosgw']['rgw_addr'] = '*:80'
+default['ceph']['radosgw']['rgw_port'] = false
+default['ceph']['radosgw']['webserver_companion'] = 'apache2' # can be false
+default['ceph']['radosgw']['use_apache_fork'] = true
 case node['platform']
 when 'ubuntu'
-  default["ceph"]["radosgw"]["init_style"] = "upstart"
+  default['ceph']['radosgw']['init_style'] = 'upstart'
 else
-  default["ceph"]["radosgw"]["init_style"] = "sysvinit"
+  default['ceph']['radosgw']['init_style'] = 'sysvinit'
 end

diff --git a/attributes/repo.rb b/attributes/repo.rb
index 24c65861fd96673c17fde21237073dd7c7d17b00..93a4701a971bcdba3a52b378a5769419b7dcb20e 100644 (file)
--- a/attributes/repo.rb
+++ b/attributes/repo.rb
@@ -1,43 +1,43 @@
-default['ceph']['branch'] = "stable" # Can be stable, testing or dev.
+default['ceph']['branch'] = 'stable' # Can be stable, testing or dev.
 # Major release version to install or gitbuilder branch
-default['ceph']['version'] = "dumpling"
+default['ceph']['version'] = 'dumpling'
 default['ceph']['el_add_epel'] = true
-default['ceph']['repo_url'] = "http://ceph.com"
-default['ceph']['extras_repo_url'] = "http://ceph.com/packages/ceph-extras"
+default['ceph']['repo_url'] = 'http://ceph.com'
+default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras'
 default['ceph']['extras_repo'] = false
 
 case node['platform_family']
-when "debian"
+when 'debian'
   # Debian/Ubuntu default repositories
   default['ceph']['debian']['stable']['repository'] = "#{node['ceph']['repo_url']}/debian-#{node['ceph']['version']}/"
-  default['ceph']['debian']['stable']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc"
+  default['ceph']['debian']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
   default['ceph']['debian']['testing']['repository'] = "#{node['ceph']['repo_url']}/debian-testing/"
-  default['ceph']['debian']['testing']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc"
+  default['ceph']['debian']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
   default['ceph']['debian']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/#{node['ceph']['version']}"
-  default['ceph']['debian']['dev']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+  default['ceph']['debian']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
   default['ceph']['debian']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/debian/"
-  default['ceph']['debian']['extras']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc"
-when "rhel"
+  default['ceph']['debian']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+when 'rhel'
   # Redhat/CentOS default repositories
   default['ceph']['rhel']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/el6/noarch/ceph-release-1-0.el6.noarch.rpm"
   default['ceph']['rhel']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/el6/x86_64/ceph-release-1-0.el6.noarch.rpm"
   default['ceph']['rhel']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-centos6-x86_64-basic/ref/#{node['ceph']['version']}/x86_64/"
-  default['ceph']['rhel']['dev']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+  default['ceph']['rhel']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
   default['ceph']['rhel']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/rhel6/x86_64/"
-  default['ceph']['rhel']['extras']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
-when "fedora"
+  default['ceph']['rhel']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
+when 'fedora'
   # Fedora default repositories
   default['ceph']['fedora']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/fc#{node['platform_version']}/x86_64/ceph-release-1-0.fc#{node['platform_version']}.noarch.rpm"
   default['ceph']['fedora']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/fc#{node['platform_version']}/x86_64/ceph-release-1-0.fc#{node['platform_version']}.noarch.rpm"
   default['ceph']['fedora']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-fc#{node['platform_version']}-x86_64-basic/ref/#{node['ceph']['version']}/RPMS/x86_64/"
-  default['ceph']['fedora']['dev']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+  default['ceph']['fedora']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
   default['ceph']['fedora']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/fedora#{node['platform_version']}/x86_64/"
-  default['ceph']['fedora']['extras']['repository_key'] = "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
-when "suse"
+  default['ceph']['fedora']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
+when 'suse'
   # (Open)SuSE default repositories
   # Chef doesn't make a difference between suse and opensuse
   suse = Mixlib::ShellOut.new("head -n1 /etc/SuSE-release| awk '{print $1}'").run_command.stdout.chomp.downcase
-  suse = "sles" if suse == "suse"
+  suse = 'sles' if suse == 'suse'
   suse_version = suse << Mixlib::ShellOut.new("grep VERSION /etc/SuSE-release | awk -F'= ' '{print $2}'").run_command.stdout.chomp
 
   default['ceph']['suse']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/#{suse_version}/x86_64/ceph-release-1-0.#{suse_version}.noarch.rpm"

diff --git a/infrastructure.yml b/infrastructure.yml
new file mode 100644 (file)
index 0000000..de8655b
--- /dev/null
+++ b/infrastructure.yml
@@ -0,0 +1,6 @@
+roles:
+- ceph-mds:
+- ceph-mon:
+- ceph-osd:
+- ceph-radosgw:
+- ceph-tgt:

diff --git a/libraries/default.rb b/libraries/default.rb
index 860831ac2a9919fc4612f28a6e7485cbd3d38002..d02f7c4bd6f7f6d78b49bcba29716ac5b58dcdbb 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -9,7 +9,7 @@ def get_mon_nodes(extra_search = nil)
   if crowbar?
     mon_roles = search(:role, 'name:crowbar-* AND run_list:role\[ceph-mon\]')
     unless mon_roles.empty?
-      search_string = mon_roles.map { |role_object| "roles:" + role_object.name }.join(' OR ')
+      search_string = mon_roles.map { |role_object| 'roles:' + role_object.name }.join(' OR ')
       search_string = "(#{search_string}) AND ceph_config_environment:#{node['ceph']['config']['environment']}"
     end
   else
@@ -31,11 +31,11 @@ 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|
-    addrs["addresses"].each do |ip, params|
-      if params['family'].eql?("inet6") && net.include?(ip)
+  nodeish['network']['interfaces'].each do |iface, addrs|
+    addrs['addresses'].each do |ip, params|
+      if params['family'].eql?('inet6') && net.include?(ip)
         return "[#{ip}]:6789"
-      elsif params['family'].eql?("inet") && net.include?(ip)
+      elsif params['family'].eql?('inet') && net.include?(ip)
         return "#{ip}:6789"
       end
     end
@@ -46,7 +46,7 @@ end
 def mon_addresses
   mon_ips = []
 
-  if File.exists?("/var/run/ceph/ceph-mon.#{node['hostname']}.asok")
+  if File.exist?("/var/run/ceph/ceph-mon.#{node['hostname']}.asok")
     mon_ips = quorum_members_ips
   else
     mons = []
@@ -57,12 +57,12 @@ def mon_addresses
 
     mons += get_mon_nodes
     if crowbar?
-      mon_ips = mons.map { |node| Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address }
+      mon_ips = mons.map { |node| Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, 'admin').address }
     else
       if node['ceph']['config']['global'] && node['ceph']['config']['global']['public network']
         mon_ips = mons.map { |nodeish| find_node_ip_in_network(node['ceph']['config']['global']['public network'], nodeish) }
       else
-        mon_ips = mons.map { |node| node['ipaddress'] + ":6789" }
+        mon_ips = mons.map { |node| node['ipaddress'] + ':6789' }
       end
     end
   end

diff --git a/metadata.rb b/metadata.rb
index bcdf3832d61d1902489e557df29ddcf6d93f7ce9..10a94dd52fd65e317de63de9bd0b4e1093e9cf97 100644 (file)
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,12 +1,12 @@
-name                    "ceph"
-maintainer              "Kyle Bader"
-maintainer_email        "kyle.bader@dreamhost.com"
-license                 "Apache 2.0"
-description             "Installs/Configures the Ceph distributed filesystem"
+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"
+version                        '0.2.1'
 
-depends        "apache2", ">= 1.1.12"
-depends "apt"
-depends "yum", ">= 3.0"
-depends "yum-epel"
+depends        'apache2', '>= 1.1.12'
+depends 'apt'
+depends 'yum', '>= 3.0'
+depends 'yum-epel'

diff --git a/providers/client.rb b/providers/client.rb
index f51e1b6acffee64f589498d93440011fae5e4c9c..becada6b196906af0510fd017c0b6a576ee47e76 100644 (file)
--- a/providers/client.rb
+++ b/providers/client.rb
@@ -16,9 +16,9 @@ action :add do
 
   file filename do
     content file_content
-    owner "root"
-    group "root"
-    mode "640"
+    owner 'root'
+    group 'root'
+    mode '640'
   end
 end
 
@@ -53,21 +53,21 @@ end
 
 def auth_set_key(keyname, caps)
   # find the monitor secret
-  mon_secret = ""
+  mon_secret = ''
   mons = get_mon_nodes
   if !mons.empty?
-    mon_secret = mons[0]["ceph"]["monitor-secret"]
-  elsif mons.empty? && node["ceph"]["monitor-secret"]
-    mon_secret = node["ceph"]["monitor-secret"]
+    mon_secret = mons[0]['ceph']['monitor-secret']
+  elsif mons.empty? && node['ceph']['monitor-secret']
+    mon_secret = node['ceph']['monitor-secret']
   else
-    Chef::Log.warn("No monitor secret found")
+    Chef::Log.warn('No monitor secret found')
   end
   # try to add the key
   cmd = "ceph auth get-or-create #{keyname} #{caps} --name mon. --key='#{mon_secret}'"
   get_or_create = Mixlib::ShellOut.new(cmd)
   get_or_create.run_command
   if get_or_create.stderr.scan(/EINVAL.*but cap.*does not match/)
-    Chef::Log.info("Deleting old key with incorrect caps")
+    Chef::Log.info('Deleting old key with incorrect caps')
     # delete an old key if it exists and is wrong
     Mixlib::ShellOut.new("ceph auth del #{keyname}").run_command
     # try to create again

diff --git a/recipes/apt.rb b/recipes/apt.rb
index 6395869a807805e6219e97e1cf3e747353d5bcb9..894a6ebf232763b7c4426a93e6626c5c83f11120 100644 (file)
--- a/recipes/apt.rb
+++ b/recipes/apt.rb
@@ -1,43 +1,43 @@
 
-include_recipe "apt"
+include_recipe 'apt'
 
 branch = node['ceph']['branch']
 
-apt_repository "ceph" do
-  repo_name "ceph"
+apt_repository 'ceph' do
+  repo_name 'ceph'
   uri node['ceph']['debian'][branch]['repository']
-  distribution node['lsb']['codename'] == "jessie" ? "sid" : node['lsb']['codename']
+  distribution node['lsb']['codename'] == 'jessie' ? 'sid' : node['lsb']['codename']
   components ['main']
   key node['ceph']['debian'][branch]['repository_key']
 end
 
-apt_repository "ceph-extras" do
-  repo_name "ceph-extras"
+apt_repository 'ceph-extras' do
+  repo_name 'ceph-extras'
   uri node['ceph']['debian']['extras']['repository']
-  distribution node['lsb']['codename'] == "jessie" ? "sid" : node['lsb']['codename']
+  distribution node['lsb']['codename'] == 'jessie' ? 'sid' : node['lsb']['codename']
   components ['main']
   key node['ceph']['debian']['extras']['repository_key']
   only_if { node['ceph']['extras_repo'] }
 end
 
 if node['ceph']['is_radosgw'] \
- && node["ceph"]["radosgw"]["webserver_companion"] == "apache2" \
- && node["ceph"]["radosgw"]["use_apache_fork"] == true
+ && node['ceph']['radosgw']['webserver_companion'] == 'apache2' \
+ && node['ceph']['radosgw']['use_apache_fork'] == true
   case node['lsb']['codename']
-  when "precise", "oneiric"
-    apt_repository "ceph-apache2" do
-      repo_name "ceph-apache2"
+  when 'precise', 'oneiric'
+    apt_repository 'ceph-apache2' do
+      repo_name 'ceph-apache2'
       uri "http://gitbuilder.ceph.com/apache2-deb-#{node['lsb']['codename']}-x86_64-basic/ref/master"
       distribution node['lsb']['codename']
-      components ["main"]
-      key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+      components ['main']
+      key 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
     end
-    apt_repository "ceph-modfastcgi" do
-      repo_name "ceph-modfastcgi"
+    apt_repository 'ceph-modfastcgi' do
+      repo_name 'ceph-modfastcgi'
       uri "http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-#{node['lsb']['codename']}-x86_64-basic/ref/master"
       distribution node['lsb']['codename']
-      components ["main"]
-      key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+      components ['main']
+      key 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
     end
   else
     Log.info("Ceph's Apache and Apache FastCGI forks not available for this distribution")

diff --git a/recipes/cephfs.rb b/recipes/cephfs.rb
index 0e75145421c3d002468fbbeef0020ad3d1b933bb..0d6e4b6489cfef07f3a1ca2179a48738256e0e1f 100644 (file)
--- a/recipes/cephfs.rb
+++ b/recipes/cephfs.rb
@@ -17,24 +17,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_recipe "ceph::conf"
+include_recipe 'ceph::conf'
 
-name = "cephfs"
+name = 'cephfs'
 client_name = "cephfs.#{node['hostname']}"
 filename = "/etc/ceph/ceph.client.#{client_name}.secret"
 
 ceph_client name do
   filename filename
-  caps("mon" => "allow r", "osd" => "allow rw", "mds" => "allow")
+  caps('mon' => 'allow r', 'osd' => 'allow rw', 'mds' => 'allow')
   as_keyring false
 end
 
-mons = mon_addresses.join(",") + ":/"
+mons = mon_addresses.join(',') + ':/'
 
 directory node['ceph']['cephfs_mount']
 
 mount node['ceph']['cephfs_mount'] do
-  fstype "ceph"
+  fstype 'ceph'
   device mons
   options "_netdev,name=#{client_name},secretfile=#{filename}"
   dump 0

diff --git a/recipes/conf.rb b/recipes/conf.rb
index 56c50bf6352138cd90a89a55ce71c979a707e790..f7352602b1332c5d80f283f7f5c724f4ca370081 100644 (file)
--- a/recipes/conf.rb
+++ b/recipes/conf.rb
@@ -1,10 +1,10 @@
-fail "fsid must be set in config" if node["ceph"]["config"]['fsid'].nil?
-fail "mon_initial_members must be set in config" if node["ceph"]["config"]['mon_initial_members'].nil?
+fail 'fsid must be set in config' if node['ceph']['config']['fsid'].nil?
+fail 'mon_initial_members must be set in config' if node['ceph']['config']['mon_initial_members'].nil?
 
-directory "/etc/ceph" do
-  owner "root"
-  group "root"
-  mode "0755"
+directory '/etc/ceph' do
+  owner 'root'
+  group 'root'
+  mode '0755'
   action :create
 end
 

diff --git a/recipes/default.rb b/recipes/default.rb
index 389de9a9e762d2d9d6e1b6ffe297f85e15d27a4c..fd590ded68cb3433601d03fe653fd4ff993ac879 100644 (file)
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -20,28 +20,28 @@
 packages = []
 
 case node['platform_family']
-when "debian"
-  packages = %w{
-      ceph
-      ceph-common
-  }
+when 'debian'
+  packages = %w(
+    ceph
+    ceph-common
+)
 
   if node['ceph']['install_debug']
-    packages_dbg = %w{
+    packages_dbg = %w(
       ceph-dbg
       ceph-common-dbg
-    }
+)
     packages += packages_dbg
   end
-when "rhel", "fedora"
-  packages = %w{
-      ceph
-  }
+when 'rhel', 'fedora'
+  packages = %w(
+    ceph
+)
 
   if node['ceph']['install_debug']
-    packages_dbg = %w{
+    packages_dbg = %w(
       ceph-debug
-    }
+)
     packages += packages_dbg
   end
 end

diff --git a/recipes/mds.rb b/recipes/mds.rb
index 73f9034a9dfbec92e22a6757668403c8141dc35a..658de9dab4506fb71d842187457cf588fad80cae 100644 (file)
--- a/recipes/mds.rb
+++ b/recipes/mds.rb
@@ -17,57 +17,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_recipe "ceph::default"
-include_recipe "ceph::conf"
+include_recipe 'ceph::default'
+include_recipe 'ceph::conf'
 
 cluster = 'ceph'
 
 directory "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}" do
-  owner "root"
-  group "root"
+  owner 'root'
+  group 'root'
   mode 00755
   recursive true
   action :create
 end
 
-ruby_block "create mds client key" do
+ruby_block 'create mds client key' do
   block do
     cmd = "ceph auth get-or-create mds.#{node['hostname']} osd 'allow *' mon 'allow rwx' --name mon. --key='#{node["ceph"]["monitor-secret"]}'"
     keyring = Mixlib::ShellOut.new(cmd).run_command.stdout
 
-    keyfile = File.new("/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/keyring", "w")
+    keyfile = File.new("/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/keyring", 'w')
     keyfile.puts(keyring)
     keyfile.close
   end
 end
 
 file "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}/done" do
-  owner "root"
-  group "root"
+  owner 'root'
+  group 'root'
   mode 00644
 end
 
-service_type = node["ceph"]["osd"]["init_style"]
+service_type = node['ceph']['osd']['init_style']
 
 case service_type
-when "upstart"
-  filename = "upstart"
+when 'upstart'
+  filename = 'upstart'
 else
-  filename = "sysvinit"
+  filename = 'sysvinit'
 end
 file "/var/lib/ceph/mds/#{cluster}-#{node["hostname"]}/#{filename}" do
-  owner "root"
-  group "root"
+  owner 'root'
+  group 'root'
   mode 00644
 end
 
-service "ceph_mds" do
+service 'ceph_mds' do
   case service_type
-  when "upstart"
-    service_name "ceph-mds-all-starter"
+  when 'upstart'
+    service_name 'ceph-mds-all-starter'
     provider Chef::Provider::Service::Upstart
   else
-    service_name "ceph"
+    service_name 'ceph'
   end
   action [:enable, :start]
   supports :restart => true

diff --git a/recipes/mon.rb b/recipes/mon.rb
index 46560020cd01f971f51244d7e247bb4b16593d08..d899107d2e03c9f96b0f1eabc49f8d35a48b29b1 100644 (file)
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -14,24 +14,24 @@
 #  different and are created in
 #  /var/lib/ceph/bootstrap-{osd,mds}/ceph.keyring
 
-include_recipe "ceph::default"
-include_recipe "ceph::conf"
+include_recipe 'ceph::default'
+include_recipe 'ceph::conf'
 
-service_type = node["ceph"]["mon"]["init_style"]
+service_type = node['ceph']['mon']['init_style']
 
 node.default['ceph']['is_mon'] = true
 
-directory "/var/run/ceph" do
-  owner "root"
-  group "root"
+directory '/var/run/ceph' do
+  owner 'root'
+  group 'root'
   mode 00755
   recursive true
   action :create
 end
 
 directory "/var/lib/ceph/mon/ceph-#{node["hostname"]}" do
-  owner "root"
-  group "root"
+  owner 'root'
+  group 'root'
   mode 00755
   recursive true
   action :create
@@ -40,17 +40,17 @@ end
 # TODO: cluster name
 cluster = 'ceph'
 
-unless File.exists?("/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']
-    secret = Chef::EncryptedDataBagItem.load_secret(node["ceph"]["mon"]["secret_file"])
-    monitor_secret = Chef::EncryptedDataBagItem.load("ceph", "mon", secret)["secret"]
+    secret = Chef::EncryptedDataBagItem.load_secret(node['ceph']['mon']['secret_file'])
+    monitor_secret = Chef::EncryptedDataBagItem.load('ceph', 'mon', secret)['secret']
   else
-    monitor_secret = node["ceph"]["monitor-secret"]
+    monitor_secret = node['ceph']['monitor-secret']
   end
 
-  execute "format as keyring" do
+  execute 'format as keyring' do
     command "ceph-authtool '#{keyring}' --create-keyring --name=mon. --add-key='#{monitor_secret}' --cap mon 'allow *'"
     creates "#{Chef::Config[:file_cache_path]}/#{cluster}-#{node['hostname']}.mon.keyring"
   end
@@ -59,34 +59,34 @@ unless File.exists?("/var/lib/ceph/mon/ceph-#{node["hostname"]}/done")
     command "ceph-mon --mkfs -i #{node['hostname']} --keyring '#{keyring}'"
   end
 
-  ruby_block "finalise" do
+  ruby_block 'finalise' do
     block do
-      ["done", service_type].each do |ack|
-        ::File.open("/var/lib/ceph/mon/ceph-#{node["hostname"]}/#{ack}", "w").close
+      ['done', service_type].each do |ack|
+        ::File.open("/var/lib/ceph/mon/ceph-#{node["hostname"]}/#{ack}", 'w').close
       end
     end
   end
 end
 
-if service_type == "upstart"
-  service "ceph-mon" do
+if service_type == 'upstart'
+  service 'ceph-mon' do
     provider Chef::Provider::Service::Upstart
     action :enable
   end
-  service "ceph-mon-all" do
+  service 'ceph-mon-all' do
     provider Chef::Provider::Service::Upstart
     supports :status => true
     action [:enable, :start]
   end
 end
 
-service "ceph_mon" do
+service 'ceph_mon' do
   case service_type
-  when "upstart"
-    service_name "ceph-mon-all-starter"
+  when 'upstart'
+    service_name 'ceph-mon-all-starter'
     provider Chef::Provider::Service::Upstart
   else
-    service_name "ceph"
+    service_name 'ceph'
   end
   supports :restart => true, :status => true
   action [:enable, :start]
@@ -103,11 +103,11 @@ end
 # created,
 # We store it when it is created
 unless node['ceph']['encrypted_data_bags']
-  ruby_block "get osd-bootstrap keyring" do
+  ruby_block 'get osd-bootstrap keyring' do
     block do
-      run_out = ""
+      run_out = ''
       while run_out.empty?
-        run_out = Mixlib::ShellOut.new("ceph auth get-key client.bootstrap-osd").run_command.stdout.strip
+        run_out = Mixlib::ShellOut.new('ceph auth get-key client.bootstrap-osd').run_command.stdout.strip
         sleep 2
       end
       node.override['ceph']['bootstrap_osd_key'] = run_out

diff --git a/recipes/osd.rb b/recipes/osd.rb
index fd5d216518eed23c3e5bb5ee7ffe89d2b10f1427..5c35bca641bd22b54b9f7c51eb4ae25d3b510bbd 100644 (file)
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -31,8 +31,8 @@
 #   }
 # ]
 
-include_recipe "ceph::default"
-include_recipe "ceph::conf"
+include_recipe 'ceph::default'
+include_recipe 'ceph::conf'
 
 package 'gdisk' do
   action :upgrade
@@ -43,50 +43,50 @@ package 'cryptsetup' do
   only_if { node['dmcrypt'] }
 end
 
-service_type = node["ceph"]["osd"]["init_style"]
-mons = node['ceph']['encrypted_data_bags'] ? get_mon_nodes : get_mon_nodes("ceph_bootstrap_osd_key:*")
+service_type = node['ceph']['osd']['init_style']
+mons = node['ceph']['encrypted_data_bags'] ? get_mon_nodes : get_mon_nodes('ceph_bootstrap_osd_key:*')
 
-return "No ceph-mon found." if mons.empty?
+return 'No ceph-mon found.' if mons.empty?
 
-directory "/var/lib/ceph/bootstrap-osd" do
-  owner "root"
-  group "root"
-  mode "0755"
+directory '/var/lib/ceph/bootstrap-osd' do
+  owner 'root'
+  group 'root'
+  mode '0755'
 end
 
 # TODO: cluster name
 cluster = 'ceph'
 
 if node['ceph']['encrypted_data_bags']
-  secret = Chef::EncryptedDataBagItem.load_secret(node["ceph"]["osd"]["secret_file"])
-  osd_secret = Chef::EncryptedDataBagItem.load("ceph", "osd", secret)["secret"]
+  secret = Chef::EncryptedDataBagItem.load_secret(node['ceph']['osd']['secret_file'])
+  osd_secret = Chef::EncryptedDataBagItem.load('ceph', 'osd', secret)['secret']
 else
-  osd_secret = mons[0]["ceph"]["bootstrap_osd_key"]
+  osd_secret = mons[0]['ceph']['bootstrap_osd_key']
 end
 
-execute "format as keyring" do
+execute 'format as keyring' do
   command "ceph-authtool '/var/lib/ceph/bootstrap-osd/#{cluster}.keyring' --create-keyring --name=client.bootstrap-osd --add-key='#{osd_secret}'"
   creates "/var/lib/ceph/bootstrap-osd/#{cluster}.keyring"
 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" }
-      notifies :run, "execute[udev trigger]", :immediately
+      only_if { node['crowbar']['disks'][disk]['usage'] == 'Storage' }
+      notifies :run, 'execute[udev trigger]', :immediately
     end
 
     ruby_block "set disk usage for #{disk}" do
       block do
-        node.set["crowbar"]["disks"][disk]["usage"] = "ceph-osd"
+        node.set['crowbar']['disks'][disk]['usage'] = 'ceph-osd'
         node.save
       end
     end
   end
 
-  execute "udev trigger" do
-    command "udevadm trigger --subsystem-match=block --action=add"
+  execute 'udev trigger' do
+    command 'udevadm trigger --subsystem-match=block --action=add'
     action :nothing
   end
 else
@@ -99,25 +99,25 @@ else
   # osd/$cluster-$id)
   #  - $cluster should always be ceph
   #  - The --dmcrypt option will be available starting w/ Cuttlefish
-  if !node["ceph"]["osd_devices"].nil?
-    devices = node["ceph"]["osd_devices"]
+  if !node['ceph']['osd_devices'].nil?
+    devices = node['ceph']['osd_devices']
 
     devices = Hash[(0...devices.size).zip devices] unless devices.kind_of? Hash
 
     devices.each do |index, osd_device|
-      unless osd_device["status"].nil?
+      unless osd_device['status'].nil?
         Log.info("osd: osd_device #{osd_device} has already been setup.")
         next
       end
 
-      directory osd_device["device"] do # ~FC022
-        owner "root"
-        group "root"
+      directory osd_device['device'] do # ~FC022
+        owner 'root'
+        group 'root'
         recursive true
-        only_if { osd_device["type"] == "directory" }
+        only_if { osd_device['type'] == 'directory' }
       end
 
-      dmcrypt = osd_device["encrypted"] == true ? '--dmcrypt' : ''
+      dmcrypt = osd_device['encrypted'] == true ? '--dmcrypt' : ''
 
       execute "ceph-disk-prepare on #{osd_device['device']}" do
         command "ceph-disk-prepare #{dmcrypt} #{osd_device['device']} #{osd_device['journal']}"
@@ -126,7 +126,7 @@ else
       end
 
       execute "ceph-disk-activate #{osd_device['device']}" do
-        only_if { osd_device["type"] == "directory" }
+        only_if { osd_device['type'] == 'directory' }
       end
 
       # we add this status to the node env
@@ -135,19 +135,19 @@ else
       # future.
       ruby_block "save osd_device status #{index}" do
         block do
-          node.normal["ceph"]["osd_devices"][index]["status"] = "deployed"
+          node.normal['ceph']['osd_devices'][index]['status'] = 'deployed'
           node.save
         end
         action :nothing
       end
     end
-    service "ceph_osd" do
+    service 'ceph_osd' do
       case service_type
-      when "upstart"
-        service_name "ceph-osd-all-starter"
+      when 'upstart'
+        service_name 'ceph-osd-all-starter'
         provider Chef::Provider::Service::Upstart
       else
-        service_name "ceph"
+        service_name 'ceph'
       end
       action [:enable, :start]
       supports :restart => true

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 2d178c0ed264522d17726f14f65dcc1b7860798e..a69ffbca286d1b3a10493cba40b1d66cd1de71df 100644 (file)
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -20,21 +20,21 @@
 node.default['ceph']['is_radosgw'] = true
 
 case node['platform_family']
-when "debian"
-  packages = %w{
+when 'debian'
+  packages = %w(
     radosgw
-  }
+)
 
   if node['ceph']['install_debug']
-    packages_dbg = %w{
+    packages_dbg = %w(
       radosgw-dbg
-    }
+)
     packages += packages_dbg
   end
-when "rhel", "fedora", "suse"
-  packages = %w{
+when 'rhel', 'fedora', 'suse'
+  packages = %w(
     ceph-radosgw
-  }
+)
 end
 
 packages.each do |pkg|
@@ -43,36 +43,36 @@ packages.each do |pkg|
   end
 end
 
-include_recipe "ceph::conf"
+include_recipe 'ceph::conf'
 
 if !::File.exists?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done")
-  if node["ceph"]["radosgw"]["webserver_companion"]
+  if node['ceph']['radosgw']['webserver_companion']
     include_recipe "ceph::radosgw_#{node["ceph"]["radosgw"]["webserver_companion"]}"
   end
 
-  ceph_client "radosgw" do
-    caps("mon" => "allow rw", "osd" => "allow rwx")
+  ceph_client 'radosgw' do
+    caps('mon' => 'allow rw', 'osd' => 'allow rwx')
   end
 
   file "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done" do
     action :create
   end
 
-  service "radosgw" do
-    case node["ceph"]["radosgw"]["init_style"]
-    when "upstart"
-      service_name "radosgw-all-starter"
+  service 'radosgw' do
+    case node['ceph']['radosgw']['init_style']
+    when 'upstart'
+      service_name 'radosgw-all-starter'
       provider Chef::Provider::Service::Upstart
     else
-      if node['platform'] == "debian"
-        service_name "radosgw"
+      if node['platform'] == 'debian'
+        service_name 'radosgw'
       else
-        service_name "ceph-radosgw"
+        service_name 'ceph-radosgw'
       end
     end
     supports :restart => true
     action [:enable, :start]
   end
 else
-  Log.info("Rados Gateway already deployed")
+  Log.info('Rados Gateway already deployed')
 end

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index eaba3e5c60377d953180f5c3184f150299d7e4f9..59e8233f59f3eef8be1c7853ee05b78330b4ca11 100644 (file)
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -18,16 +18,16 @@
 # limitations under the License.
 
 case node['platform_family']
-when "debian", "suse"
-  packages = %w{
+when 'debian', 'suse'
+  packages = %w(
     apache2
     libapache2-mod-fastcgi
-  }
-when "rhel", "fedora"
-  packages = %w{
+)
+when 'rhel', 'fedora'
+  packages = %w(
     httpd
     mod_fastcgi
-  }
+)
 end
 
 packages.each do |pkg|
@@ -38,61 +38,61 @@ end
 
 # For EL, delete the current fastcgi configuration
 # and set the correct owners for dirs and logs
-d_owner = d_group = "root"
-if node['platform_family'] == "rhel"
+d_owner = d_group = 'root'
+if node['platform_family'] == 'rhel'
   file "#{node['apache']['dir']}/conf.d/fastcgi.conf" do
     action :delete
     backup false
   end
-  d_owner = d_group = "apache"
+  d_owner = d_group = 'apache'
 end
 
-%W{ /var/run/ceph
-    /var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}
-    /var/lib/apache2/
-}.each do |dir|
+%W(/var/run/ceph
+   /var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}
+   /var/lib/apache2/
+).each do |dir|
   directory dir do
     owner d_owner
     group d_group
-    mode "0755"
+    mode '0755'
     recursive true
     action :create
   end
 end
 
-file "/var/log/radosgw/radosgw.log" do
+file '/var/log/radosgw/radosgw.log' do
   owner d_owner
   group d_group
-  mode "0644"
+  mode '0644'
   action :create
 end
 
-include_recipe "apache2"
+include_recipe 'apache2'
 
-apache_module "fastcgi" do
+apache_module 'fastcgi' do
   conf true
 end
 
-apache_module "rewrite" do
+apache_module 'rewrite' do
   conf false
 end
 
-web_app "rgw" do
-  template "rgw.conf.erb"
+web_app 'rgw' do
+  template 'rgw.conf.erb'
   server_name node['ceph']['radosgw']['api_fqdn']
   admin_email node['ceph']['radosgw']['admin_email']
   ceph_rgw_addr node['ceph']['radosgw']['rgw_addr']
 end
 
-service "apache2" do
+service 'apache2' do
   action :restart
 end
 
-template "/var/www/s3gw.fcgi" do
-  source "s3gw.fcgi.erb"
-  owner "root"
-  group "root"
-  mode "0755"
+template '/var/www/s3gw.fcgi' do
+  source 's3gw.fcgi.erb'
+  owner 'root'
+  group 'root'
+  mode '0755'
   variables(
     :ceph_rgw_client => "client.radosgw.#{node['hostname']}"
   )

diff --git a/recipes/repo.rb b/recipes/repo.rb
index dbdf4fd25dfd7fb84b0f39d1beee9db1a8405afa..986355a8f6cd51f82500505606125140f90076d2 100644 (file)
--- a/recipes/repo.rb
+++ b/recipes/repo.rb
@@ -1,8 +1,8 @@
 case node['platform_family']
-when "debian"
-  include_recipe "ceph::apt"
-when "rhel", "suse"
-  include_recipe "ceph::rpm"
+when 'debian'
+  include_recipe 'ceph::apt'
+when 'rhel', 'suse'
+  include_recipe 'ceph::rpm'
 else
-  fail "not supported"
+  fail 'not supported'
 end

diff --git a/recipes/rpm.rb b/recipes/rpm.rb
index 904c6c0dc10845e225d6f4f479cb3dda6b6888e4..14c899cd6af77ac5bd08f13a3f9e157c67a14539 100644 (file)
--- a/recipes/rpm.rb
+++ b/recipes/rpm.rb
@@ -1,23 +1,23 @@
 platform_family = node['platform_family']
 
 case platform_family
-when "rhel"
-  include_recipe "yum-epel" if node['ceph']['el_add_epel']
+when 'rhel'
+  include_recipe 'yum-epel' if node['ceph']['el_add_epel']
 end
 
 branch = node['ceph']['branch']
-if branch == "dev" && platform_family != "centos" && platform_family != "fedora"
+if branch == 'dev' && platform_family != 'centos' && platform_family != 'fedora'
   fail "Dev branch for #{platform_family} is not yet supported"
 end
 
 repo = node['ceph'][platform_family][branch]['repository']
 
-yum_repository "ceph" do
+yum_repository 'ceph' do
   baseurl repo
-  gpgkey node['ceph'][platform_family]['dev']['repository_key'] if branch == "dev"
+  gpgkey node['ceph'][platform_family]['dev']['repository_key'] if branch == 'dev'
 end
 
-yum_repository "ceph-extra" do
+yum_repository 'ceph-extra' do
   baseurl node['ceph'][platform_family]['extras']['repository']
   gpgkey node['ceph'][platform_family]['extras']['repository_key']
   only_if { node['ceph']['extras_repo'] }

diff --git a/recipes/tgt.rb b/recipes/tgt.rb
index ea8d144c65188763835642a23370bb0330f7d88b..330047a903a82d3809ecfa37150c86b757c05765 100644 (file)
--- a/recipes/tgt.rb
+++ b/recipes/tgt.rb
@@ -20,14 +20,14 @@
 node.default['ceph']['extras_repo'] = true
 
 case node['platform_family']
-when "debian"
-  packages = %w{
+when 'debian'
+  packages = %w(
     tgt
-  }
-when "rhel", "fedora"
-  packages = %w{
+)
+when 'rhel', 'fedora'
+  packages = %w(
     scsi-target-utils
-  }
+)
 end
 
 packages.each do |pkg|
@@ -36,15 +36,15 @@ packages.each do |pkg|
   end
 end
 
-include_recipe "ceph::conf"
+include_recipe 'ceph::conf'
 # probably needs the key
-service "tgt" do
-  if node['platform'] == "ubuntu"
+service 'tgt' do
+  if node['platform'] == 'ubuntu'
     # The ceph version of tgt does not provide an Upstart script
     provider Chef::Provider::Service::Init::Debian
-    service_name "tgt"
+    service_name 'tgt'
   else
-    service_name "tgt"
+    service_name 'tgt'
   end
   supports :restart => true
   action [:enable, :start]

diff --git a/resources/client.rb b/resources/client.rb
index 7ef91c37edbe95769185bfc1b3bbf4a4c48c4de6..e8af62aff8250a3405f4baed376f21509c17dc98 100644 (file)
--- a/resources/client.rb
+++ b/resources/client.rb
@@ -2,7 +2,7 @@ actions :add
 default_action :add
 
 attribute :name, :kind_of => String, :name_attribute => true
-attribute :caps, :kind_of => Hash, :default => { "mon" => "allow r", "osd" => "allow r" }
+attribute :caps, :kind_of => Hash, :default => { 'mon' => 'allow r', 'osd' => 'allow r' }
 
 # Whether to store the secret in a keyring file or a plain secret file
 attribute :as_keyring, :kind_of => [TrueClass, FalseClass], :default => true

diff --git a/roles/ceph-mds.json b/roles/ceph-mds.json
index 2fe9d3beb630fb03e3bc6c64a02b5dce821c4cc1..53831455e5de9054eb86f5e48b0cb383d64356ba 100644 (file)
--- a/roles/ceph-mds.json
+++ b/roles/ceph-mds.json
@@ -5,4 +5,4 @@
     "recipe[ceph::repo]",
     "recipe[ceph::mds]"
   ]
-}
\ No newline at end of file
+}

diff --git a/roles/ceph-mds.rb b/roles/ceph-mds.rb
deleted file mode 100644 (file)
index d662fd5..0000000
--- a/roles/ceph-mds.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "ceph-mds"
-description "Ceph Metadata Server"
-run_list(
-        'recipe[ceph::repo]',
-        'recipe[ceph::mds]'
-)

diff --git a/roles/ceph-mon.json b/roles/ceph-mon.json
index f44b3aa1b455e3ec7cbafa4c7f7d61865ec8da12..10162ffa4f0c39767bd1af136c3777e4c135a74a 100644 (file)
--- a/roles/ceph-mon.json
+++ b/roles/ceph-mon.json
@@ -5,4 +5,4 @@
     "recipe[ceph::repo]",
     "recipe[ceph::mon]"
   ]
-}
\ No newline at end of file
+}

diff --git a/roles/ceph-mon.rb b/roles/ceph-mon.rb
deleted file mode 100644 (file)
index b27d453..0000000
--- a/roles/ceph-mon.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "ceph-mon"
-description "Ceph Monitor"
-run_list(
-        'recipe[ceph::repo]',
-        'recipe[ceph::mon]'
-)

diff --git a/roles/ceph-osd.json b/roles/ceph-osd.json
index c37b66c05fcf26b47b072c0fee4c078dc2b9b616..e7494909f3d91686c0f460d8d86b52649ed8a5bf 100644 (file)
--- a/roles/ceph-osd.json
+++ b/roles/ceph-osd.json
@@ -5,4 +5,4 @@
     "recipe[ceph::repo]",
     "recipe[ceph::osd]"
   ]
-}
\ No newline at end of file
+}

diff --git a/roles/ceph-osd.rb b/roles/ceph-osd.rb
deleted file mode 100644 (file)
index 7532f24..0000000
--- a/roles/ceph-osd.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "ceph-osd"
-description "Ceph Object Storage Device"
-run_list(
-        'recipe[ceph::repo]',
-        'recipe[ceph::osd]'
-)

diff --git a/roles/ceph-radosgw.json b/roles/ceph-radosgw.json
index 722d26dc660e82a187be143e7481b7fd86853b84..925d017786bcec3b59dbf19a9ca35c12f4937366 100644 (file)
--- a/roles/ceph-radosgw.json
+++ b/roles/ceph-radosgw.json
@@ -5,4 +5,4 @@
     "recipe[ceph::repo]",
     "recipe[ceph::radosgw]"
   ]
-}
\ No newline at end of file
+}

diff --git a/roles/ceph-radosgw.rb b/roles/ceph-radosgw.rb
deleted file mode 100644 (file)
index baf0ddc..0000000
--- a/roles/ceph-radosgw.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "ceph-radosgw"
-description "Ceph RADOS Gateway"
-run_list(
-        'recipe[ceph::repo]',
-        'recipe[ceph::radosgw]'
-)

diff --git a/roles/ceph-tgt.json b/roles/ceph-tgt.json
new file mode 100644 (file)
index 0000000..f5dce87
--- /dev/null
+++ b/roles/ceph-tgt.json
@@ -0,0 +1,8 @@
+{
+  "name": "ceph-tgt",
+  "description": "Ceph iSCSI Target",
+  "run_list": [
+    "recipe[ceph::repo]",
+    "recipe[ceph::tgt]"
+  ]
+}

diff --git a/roles/ceph-tgt.rb b/roles/ceph-tgt.rb
deleted file mode 100644 (file)
index 80f6b4a..0000000
--- a/roles/ceph-tgt.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "ceph-tgt"
-description "Ceph iSCSI Target"
-run_list(
-        'recipe[ceph::repo]',
-        'recipe[ceph::tgt]'
-)