Merge pull request #364 from osm-hr/html-torrents

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

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index c0e9f5a0fd5ec28b63cdcf287a37b5fe7c875280..69e0ce2b0c508e68dbf2106f28e1f1ea0ca17b2f 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: postgresql
+# Cookbook:: postgresql

 # Resource:: postgresql_tablespace
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,9 +19,9 @@
 
 default_action :create
 
 
 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 :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)