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

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

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 9f7c9373decbe4427a209c77754d515612076402..bfa0c4b8cd361ace35d030ae28f470c84314a609 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: postgresql
+# Cookbook:: postgresql
 # Resource:: postgresql_tablespace
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
-property :tablespace, :kind_of => String, :name_attribute => true
+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)