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

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

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 93bb021ce006d8813c2f0e35183e01d1b2eb683f..bfa0c4b8cd361ace35d030ae28f470c84314a609 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,


@@ -17,10 +17,32 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-actions :create, :drop
+property :tablespace, :kind_of => String, :name_property => true
+property :cluster, :kind_of => String, :required => true
+property :location, :kind_of => String, :required => [:create]
+
+action :create do
+  unless cluster.tablespaces.include?(new_resource.tablespace)
+    converge_by "create tablespace #{new_resource.tablespace}" do
+      cluster.execute(:command => "CREATE TABLESPACE #{new_resource.tablespace} LOCATION '#{new_resource.location}'")
+    end
+  end
+end
+
+action :drop do
+  if cluster.tablespaces.include?(new_resource.tablespace)
+    converge_by "drop tablespace #{new_resource.tablespace}" do
+      cluster.execute(:command => "DROP TABLESPACE #{new_resource.tablespace}")
+    end
+  end
+end

 
 

-attribute :tablespace, :kind_of => String, :name_attribute => true
-attribute :cluster, :kind_of => String, :required => true
-attribute :location, :kind_of => String, :required => true
+action_class do
+  def cluster
+    @cluster ||= OpenStreetMap::PostgreSQL.new(new_resource.cluster)
+  end
+end