diff --git a/CHANGELOG.md b/CHANGELOG.md index da84fb1..0352e22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ rs-storage Cookbook CHANGELOG This file is used to list changes made in each version of the rs-storage cookbook. +v1.0.7 +------ + +- Issue https://github.com/gregsymons/di-ruby-lvm-attrib/issues/22 has been fixed so workaround can be removed. + v1.0.6 ------ diff --git a/files/default/di-ruby-lvm-attrib-0.0.17.gem b/files/default/di-ruby-lvm-attrib-0.0.17.gem deleted file mode 100644 index 5fb211b..0000000 Binary files a/files/default/di-ruby-lvm-attrib-0.0.17.gem and /dev/null differ diff --git a/metadata.rb b/metadata.rb index 1d11793..7a07950 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ 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.6' +version '1.0.7' depends 'chef_handler', '~> 1.1.6' depends 'filesystem', '~> 0.10.0' diff --git a/recipes/stripe.rb b/recipes/stripe.rb index 0875fed..f398923 100644 --- a/recipes/stripe.rb +++ b/recipes/stripe.rb @@ -48,19 +48,6 @@ 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'