Merge remote branch 'upstream/master' into feature/jdbc

Conflicts:
	README.md

Author: razorsedge

CHANGELOG.md

@@ -1,3 +1,14 @@
+2.0.1
+=======
+
+Minor bugfix release.
+
+2013-01-16 - Chris Price <[email protected]>
+ * Fix revoke command in database.pp to support postgres 8.1 (43ded42)
+
+2013-01-15 - Jordi Boggiano <[email protected]>
+ * Add support for ubuntu 12.10 status (3504405)
+
 2.0.0
 =======
 

Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-postgresql'
-version '2.0.0'
+version '2.0.1'
 source 'git://github.com/puppetlabs/puppet-postgresql.git'
 author 'Inkling/Puppet Labs'
 description 'PostgreSQL defined resource types'

README.md

@@ -14,7 +14,7 @@ def get_debian_postgres_version
     # TODO: add more debian versions or better logic here
     when /^6\./
       "8.4"
-    when /^wheezy/
+    when /^wheezy/, /^7\./
       "9.1"
     else
       nil

lib/facter/postgres_default_version.rb

@@ -21,7 +21,8 @@
 
 define postgresql::database(
   $dbname  = $title,
-  $charset = 'UTF8')
+  $charset = 'UTF8',
+  $tablespace = undef)
 {
   include postgresql::params
 
@@ -33,7 +34,14 @@
     $public_revoke_privilege = "ALL"
   }
 
-  $createdb_command = "${postgresql::params::createdb_path} --template=template0 --encoding '${charset}' ${locale_option} '${dbname}'"
+  $createdb_command_tmp = "${postgresql::params::createdb_path} --template=template0 --encoding '${charset}' ${locale_option} '${dbname}'"
+
+  if($tablespace == undef) {
+    $createdb_command = $createdb_command_tmp
+  }
+  else {
+    $createdb_command = "${createdb_command_tmp} --tablespace='${tablespace}'"
+  }
 
   postgresql_psql { "Check for existence of db '$dbname'":
     command => "SELECT 1",

manifests/database.pp

@@ -16,6 +16,7 @@
 #                            function in this module
 #   [*charset*]     - database charset. defaults to 'utf8'
 #   [*grant*]       - privilege to grant user. defaults to 'all'.
+#   [*tablespace*]  - database tablespace. default to use the template database's tablespace.
 #
 # Actions:
 #
@@ -35,13 +36,15 @@
   $user,
   $password,
   $charset     = 'utf8',
-  $grant       = 'ALL'
-) {
+  $grant       = 'ALL',
+  $tablespace = undef)
+{
 
   postgresql::database { $name:
     # TODO: ensure is not yet supported
     #ensure     => present,
     charset     => $charset,
+    tablespace  => $tablespace,
     #provider   => 'postgresql',
     require     => Class['postgresql::server'],
   }

manifests/db.pp

@@ -0,0 +1,54 @@
+# Define: postgresql::tablespace
+#
+# This module creates tablespace
+#
+# Parameters:
+#   [*title*]       - the name of a tablespace to be created. The name cannot begin with pg_, as such names are reserved for system tablespaces.
+#   [*owner*]       - the name of the user who will own the tablespace. If omitted, defaults to the user executing the command.
+#                     Only superusers can create tablespaces, but they can assign ownership of tablespaces to non-superusers.
+#   [*location*]    - The directory that will be used for the tablespace. The directory should be empty and must be owned by the PostgreSQL
+#                     system user. The directory must be specified by an absolute path name.
+#
+# Actions:
+#
+# Requires:
+#
+#   class postgresql::server
+#
+# Sample Usage:
+#
+#  postgresql::tablespace { 'dbspace':
+#    location => '/data/dbs',
+#  }
+#
+#
+define postgresql::tablespace(
+  $location,
+  $owner = undef,
+  $spcname  = $title)
+{
+  include postgresql::params
+
+  if ($owner == undef) {
+    $owner_section = ''
+  }
+  else {
+    $owner_section = "OWNER ${owner}"
+  }
+
+  $create_tablespace_command = "CREATE TABLESPACE ${spcname} ${owner_section} LOCATION '${location}'"
+
+  file { "${location}":
+    ensure => directory,
+    owner  => 'postgres',
+    group  => 'postgres',
+    mode => 700,
+  }
+
+  postgresql_psql { "Create tablespace '${spcname}'":
+    command => $create_tablespace_command,
+    unless  => "SELECT spcname FROM pg_tablespace WHERE spcname='${spcname}'",
+    cwd     => $postgresql::params::datadir,
+    require => [Class['postgresql::server'], File["${location}"]],
+  }
+}

manifests/tablespace.pp

@@ -5,6 +5,10 @@ You will need the following in order to run them:
 * Virtualbox
 * vagrant
 * 'sahara' gem
+* The source code for all of the dependent modules; you should clone a copy of each of these at the same level in your directory structure as your copy of puppet-postgresql.  For best results you should check out the same tag that is specified as the dependency in the puppet-postgresql `Modulefile`.  At the time of this writing, here are the github repos you'll need (but check the `Modulefile` to make sure you're up to date):
+    * stdlib : https://github.com/puppetlabs/puppetlabs-stdlib
+    * firewall : https://github.com/puppetlabs/puppetlabs-firewall
+    * apt : https://github.com/puppetlabs/puppetlabs-apt
 * A decent chunk of free disk space (~300MB per distro tested)
 * Patience :)
 
@@ -22,4 +26,4 @@ instead do something like:
     rspec ./spec/distros/ubuntu_lucid_64
 
 For some options that might speed up the testing process a bit during development,
-please see `spec/support/postgres_test_config.rb`.
+please see `spec/support/postgres_test_config.rb`.

spec/README.md

@@ -12,4 +12,18 @@ def sudo_and_log(vm, cmd)
   def sudo_psql_and_log(vm, psql_cmd, user = 'postgres')
     sudo_and_log(vm, "su #{user} -c 'psql #{psql_cmd}'")
   end
-end
+
+  def sudo_psql_and_expect_result(vm, psql_cmd, expected, user = 'postgres')
+    result = sudo_and_log(vm, "su #{user} -c 'psql -t #{psql_cmd}'")
+
+    result.sub!(/stdin: is not a tty/, '')
+    result.strip! 
+
+    ok = result == expected
+    @logger.debug("Expected: #{expected} => #{ok ? 'OK' : 'BAD'}")
+ 
+    if !ok
+      raise "An unexpected result returned - result: '#{result}' / expected: '#{expected}'"
+    end 
+  end
+end

spec/support/postgres_test_utils.rb

@@ -134,4 +134,20 @@ def install_postgres
       sudo_and_log(vm, "puppet apply --detailed-exitcodes -e '#{test_pp}'; [ $? == 4 ]")
     end
   end
+
+  describe 'postgresql::tablespace' do
+    it 'should idempotently create tablespaces and databases that are using them' do
+      test_class = 'class {"postgresql_tests::system_default::test_tablespace": }'
+
+      # Run once to check for crashes
+      sudo_and_log(vm, "puppet apply -e '#{test_class}'")
+
+      # Run again to check for idempotence
+      sudo_and_log(vm, "puppet apply --detailed-exitcodes -e '#{test_class}'")
+        
+      # Check that databases use correct tablespaces
+      sudo_psql_and_expect_result(vm, '--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb1\'"\'"', 'tablespace1')
+      sudo_psql_and_expect_result(vm, '--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb3\'"\'"', 'tablespace2')
+    end
+  end
 end