diff --git a/attributes/default.rb b/attributes/default.rb index b4f4e55..67088f7 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -28,6 +28,7 @@ default['backup']['group'] = 'root' default['backup']['dependencies'] = [] +default['backup']['install_gem?'] = true default['backup']['version'] = '4.0.2' default['backup']['version_from_git?'] = false default['backup']['git_repo'] = nil diff --git a/recipes/default.rb b/recipes/default.rb index 3262581..3c458e7 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -17,17 +17,19 @@ # limitations under the License. # -if node['backup']['version_from_git?'] - include_recipe 'gem_specific_install' - gem_specific_install "backup" do - repository node['backup']['git_repo'] - revision "master" - action :install - end -else - gem_package 'backup' do - version node['backup']['version'] if node['backup']['version'] - action :upgrade if node['backup']['upgrade?'] +if node['backup']['install_gem?'] + if node['backup']['version_from_git?'] + include_recipe 'gem_specific_install' + gem_specific_install "backup" do + repository node['backup']['git_repo'] + revision "master" + action :install + end + else + gem_package 'backup' do + version node['backup']['version'] if node['backup']['version'] + action :upgrade if node['backup']['upgrade?'] + end end end diff --git a/resources/model.rb b/resources/model.rb index c1f552c..74febb0 100644 --- a/resources/model.rb +++ b/resources/model.rb @@ -1,7 +1,7 @@ actions :create, :delete default_action :create -attribute :name, :kind_of => Symbol, :name_attribute => true, :required => true +attribute :name, :kind_of => String, :name_attribute => true, :required => true attribute :description, :kind_of => String attribute :definition, :kind_of => String