Merge pull request #30 from rightscale-cookbooks/ST-286_required_lvm_…

…gem_updated St 286 required lvm gem updated
rightscale-cookbooks · Apr 28, 2015 · a28d780 · a28d780
2 parents 1a7218c + e27f90f
commit a28d780
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ ephemeral_lvm Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the ephemeral_lvm cookbook.
 
+v1.0.11
+-------
+
+- Issue https://github.com/gregsymons/di-ruby-lvm-attrib/issues/22 has been fixed so workaround can be removed.
+
 v1.0.10
 -------
 

diff --git a/files/default/di-ruby-lvm-attrib-0.0.17.gem b/files/default/di-ruby-lvm-attrib-0.0.17.gem
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Configures available ephemeral devices on a cloud server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.10'
+version          '1.0.11'
 
 supports 'ubuntu'
 supports 'centos'

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -17,19 +17,6 @@
 # limitations under the License.
 #
 
-# 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
-
 # Include the lvm::default recipe which sets up the resources/providers for lvm
 #
 include_recipe "lvm"