Merge pull request #26 from rightscale-cookbooks/ST-1_swap_dd_for_rhel71

St 1 swap dd for rhel71

CHANGELOG.md

@@ -3,6 +3,11 @@ rs-base Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the rs-base cookbook.
 
+v1.1.5
+------
+
+- 'dd' must run when creating swapfile on RedHat Enterprise Linux 7.1.
+
 v1.1.4
 ------
 

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures rs-base'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.1.4'
+version          '1.1.5'
 
 supports "centos"
 supports "ubuntu"

recipes/swap.rb

@@ -34,10 +34,10 @@
 # The swap cookbook expects the size to be in MB. So convert the size in GB to MB.
 size_mb = node['rs-base']['swap']['size'].to_i * 1024
 
-# RHEL 7.0 currently fails using an 'fallocate' file as swap which is what is done by the 'swap' community cookbook.
+# RHEL 7.* currently fails using an 'fallocate' file as swap which is what is done by the 'swap' community cookbook.
 # Following is a workaround to create the file first with 'dd'.
 # 'dd' command generated from https://github.com/sethvargo-cookbooks/swap/blob/v0.3.8/libraries/swapfile_provider.rb#L141
-if node['platform'] == 'redhat' && node['platform_version'] == '7.0'
+if node['platform'] == 'redhat' && node['platform_version'] =~ /^7\./
   execute "dd if=/dev/zero of=#{node['rs-base']['swap']['file']} bs=1048576 count=#{size_mb}"
 end