remove unnecessary logic

sample · sample · commit c35f4c3cbedf · 2014-04-18T15:12:31.000-07:00
diff --git a/providers/default.rb b/providers/default.rb
@@ -4,7 +4,7 @@
 #
 # Author:: LLC Express 42 (info@express42.com)
 #
-# Copyright (C) 2012-2013 LLC Express 42
+# Copyright (C) 2012-2014 LLC Express 42
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -105,11 +105,7 @@ def whyrun_supported?
     group 'postgres'
     mode 0644
     variables configuration: configuration, cluster_name: cluster_name
-    if new_resource.cookbook
-      cookbook new_resource.cookbook
-    else
-      cookbook 'postgresql'
-    end
+    cookbook new_resource.cookbook
     notifies :create, 'ruby_block[restart_service]', :delayed
   end
 
@@ -119,11 +115,7 @@ def whyrun_supported?
     group 'postgres'
     mode 0644
     variables configuration: hba_configuration
-    if new_resource.cookbook
-      cookbook new_resource.cookbook
-    else
-      cookbook 'postgresql'
-    end
+    cookbook new_resource.cookbook
     notifies :create, 'ruby_block[restart_service]', :delayed
   end
 
diff --git a/resources/default.rb b/resources/default.rb
@@ -4,7 +4,7 @@
 #
 # Author:: LLC Express 42 (info@express42.com)
 #
-# Copyright (C) 2012-2013 LLC Express 42
+# Copyright (C) 2012-2014 LLC Express 42
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -29,7 +29,7 @@
 default_action :create
 
 attribute :cluster_name, kind_of: String, name_attribute: true
-attribute :cookbook, kind_of: String
+attribute :cookbook, kind_of: String, default: "postgresql"
 attribute :cluster_create_options, kind_of: Hash, default: {}
 attribute :configuration, kind_of: Hash, default: {}
 attribute :hba_configuration, kind_of: Array, default: []

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Author:: LLC Express 42 (info@express42.com)`
`6`	`6`	`#`
`7`		`-# Copyright (C) 2012-2013 LLC Express 42`
	`7`	`+# Copyright (C) 2012-2014 LLC Express 42`
`8`	`8`	`#`
`9`	`9`	`# Permission is hereby granted, free of charge, to any person obtaining a copy of`
`10`	`10`	`# this software and associated documentation files (the "Software"), to deal in`
`@@ -29,7 +29,7 @@`
`29`	`29`	`default_action :create`
`30`	`30`
`31`	`31`	`attribute :cluster_name, kind_of: String, name_attribute: true`
`32`		`-attribute :cookbook, kind_of: String`
	`32`	`+attribute :cookbook, kind_of: String, default: "postgresql"`
`33`	`33`	`attribute :cluster_create_options, kind_of: Hash, default: {}`
`34`	`34`	`attribute :configuration, kind_of: Hash, default: {}`
`35`	`35`	`attribute :hba_configuration, kind_of: Array, default: []`