From 0ebc8586e670d55d72996c7adc717d39ef9860ed Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Thu, 27 Aug 2015 16:22:19 -0500
Subject: [PATCH] Initial Liberty Changes

Metadata changes
- Updated maintainer email
- Updated the version

rubocop updates

Change-Id: I294fc0847c8ab621cc061430029b833fb952984d
---
 metadata.rb              | 8 ++++----
 providers/disk.rb        | 5 +++--
 providers/ring_script.rb | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index bc30581..5191562 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,10 +1,10 @@
 name 'openstack-object-storage'
 maintainer 'openstack-chef'
-maintainer_email 'opscode-chef-openstack@googlegroups.com'
+maintainer_email 'openstack-dev@lists.openstack.org'
 license 'Apache 2.0'
 description 'Installs and configures Openstack Swift'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '11.0.0'
+version '12.0.0'
 
 recipe 'openstack-object-storage::account-server', 'Installs the swift account server'
 recipe 'openstack-object-storage::client', 'Install the swift client'
@@ -20,5 +20,5 @@ end
 
 depends 'memcached', '>= 1.7.2'
 depends 'statsd', '>= 0.1.5'
-depends 'openstack-common', '>= 11.0.0'
-depends 'openstack-identity', '>= 11.0.0'
+depends 'openstack-common', '>= 12.0.0'
+depends 'openstack-identity', '>= 12.0.0'
diff --git a/providers/disk.rb b/providers/disk.rb
index 1014202..3f84076 100644
--- a/providers/disk.rb
+++ b/providers/disk.rb
@@ -20,7 +20,7 @@
 require 'chef/mixin/shell_out'
 include Chef::Mixin::ShellOut
 
-# rubocop:disable CyclomaticComplexity, MethodLength
+# rubocop:disable MethodLength
 def load_current_resource
   dev_name = @new_resource.name
   @current = Chef::Resource::OpenstackObjectStorageDisk.new(dev_name)
@@ -173,7 +173,8 @@ action :ensure_exists do
 
       cur_size = cur[idx][:size]
 
-      cur_min, cur_max = (req_size * 0.9), (req_size * 1.1)
+      cur_min = req_size * 0.9
+      cur_max = req_size * 1.1
       recreate = true unless (cur_size > cur_min) && (cur_size < cur_max)
 
       current_block += cur[idx][:size]
diff --git a/providers/ring_script.rb b/providers/ring_script.rb
index 3101b96..6753064 100644
--- a/providers/ring_script.rb
+++ b/providers/ring_script.rb
@@ -68,7 +68,7 @@ def generate_script # rubocop:disable Metrics/AbcSize
     # figure out what's present in the cluster
     disk_data[which] = {}
     role = node['openstack']['object-storage']["#{which}_server_chef_role"]
-    disk_state, _, _ = Chef::Search::Query.new.search(:node, "chef_environment:#{node.chef_environment} AND roles:#{role}")
+    disk_state = Chef::Search::Query.new.search(:node, "chef_environment:#{node.chef_environment} AND roles:#{role}")
     Chef::Log.info("#{which} node count: #{disk_state.count} for role: #{role}")
 
     # for a running track of available disks
@@ -131,7 +131,7 @@ def generate_script # rubocop:disable Metrics/AbcSize
       s << "# #{ip}\n"
       disk_data[which][ip].keys.sort.each do |k|
         v = disk_data[which][ip][k]
-        s << '#  ' +  v.keys.sort.select { |x| ['ip', 'device', 'uuid'].include?(x) }.map { |x| v[x] }.join(', ')
+        s << '#  ' + v.keys.sort.select { |x| ['ip', 'device', 'uuid'].include?(x) }.map { |x| v[x] }.join(', ')
         if new_disks[which].key?(v['mountpoint'])
           s << ' (NEW!)'
           new_servers << ip unless new_servers.include?(ip)