Merge pull request #13 from rightscale-cookbooks/ST-1_centos_rhel_71_…

…issues

St 1 centos rhel 71 issues

CHANGELOG.md

@@ -3,6 +3,13 @@ rs-storage Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-storage cookbook.
 
+v1.0.4
+------
+
+- Due to issue https://github.com/gregsymons/di-ruby-lvm-attrib/issues/22, updated gem added to cookbook
+  to allow use with RHEL/CentOS 7.1.
+- Updated lvm cookbook dependency version to 1.3.6.
+
 v1.0.3
 ------
 

attributes/default.rb

@@ -48,7 +48,9 @@
 default['rs-storage']['device']['controller_type'] = nil
 
 # The filesystem to be used on the device
-default['rs-storage']['device']['filesystem'] = 'ext4'
+# RHEL 7 and CentOS 7 uses XFS as their default file system.
+default['rs-storage']['device']['filesystem'] =
+  node['platform_family'] == 'rhel' && node['platform_version'] =~ /^7\./ ? 'xfs' : 'ext4'
 
 # Amount of time (in seconds) to wait for a volume to detach at decommission
 default['rs-storage']['device']['detach_timeout'] = 300

metadata.rb

@@ -4,14 +4,14 @@
 license          'Apache 2.0'
 description      'Provides recipes for managing volumes on a Server in a RightScale supported cloud'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.3'
+version          '1.0.4'
 
 depends 'chef_handler', '~> 1.1.6'
-depends 'filesystem', '~> 0.9.0'
-depends 'lvm', '~> 1.1.0'
+depends 'filesystem', '~> 0.10.0'
+depends 'lvm', '~> 1.3.6'
 depends 'marker', '~> 1.0.1'
-depends 'rightscale_backup', '~> 1.1.5'
-depends 'rightscale_volume', '~> 1.2.4'
+depends 'rightscale_backup', '~> 1.1.8'
+depends 'rightscale_volume', '~> 1.2.7'
 
 recipe 'rs-storage::default', 'Sets up required dependencies for using this cookbook'
 recipe 'rs-storage::volume', 'Creates a volume and attaches it to the server'
@@ -65,8 +65,8 @@
 
 attribute 'rs-storage/device/filesystem',
   :display_name => 'Device Filesystem',
-  :description => 'The filesystem to be used on the device. Example: ext4',
-  :default => 'ext4',
+  :description => 'The filesystem to be used on the device. Defaults are based on OS and determined in' +
+    ' attributes/defaults.rb. Example: ext4',
   :recipes => ['rs-storage::volume', 'rs-storage::stripe'],
   :required => 'optional'
 

recipes/stripe.rb

@@ -48,6 +48,19 @@
 volume_options[:volume_type] = node['rs-storage']['device']['volume_type'] if node['rs-storage']['device']['volume_type']
 volume_options[:controller_type] = node['rs-storage']['device']['controller_type'] if node['rs-storage']['device']['controller_type']
 
+# Due to issue https://github.com/gregsymons/di-ruby-lvm-attrib/issues/22
+# an update for LVM 2.0.2.115 was needed to work on RHEL/CentOS 7.1.
+# Once pull request is merged, issue closed, and rubygems updated,
+# this section and the source file can be removed.
+cookbook_file '/tmp/di-ruby-lvm-attrib-0.0.17.gem' do
+  source "di-ruby-lvm-attrib-0.0.17.gem"
+  action :nothing
+end.run_action(:create)
+chef_gem 'di-ruby-lvm-attrib' do
+  source '/tmp/di-ruby-lvm-attrib-0.0.17.gem'
+  action :install
+end
+
 # Install packages required for setting up LVM
 include_recipe 'lvm::default'