Merge remote-tracking branch 'github/pull/713'

[chef.git] / cookbooks / postgresql / resources / tablespace.rb

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 82e901228e861f9c994723f4fc0952f83ec5dc1c..bfa0c4b8cd361ace35d030ae28f470c84314a609 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -17,11 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :tablespace, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 default_action :create
 
 property :tablespace, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true

-property :location, :kind_of => String, :required => true
+property :location, :kind_of => String, :required => [:create]

 
 action :create do
   unless cluster.tablespaces.include?(new_resource.tablespace)
 
 action :create do
   unless cluster.tablespaces.include?(new_resource.tablespace)