From ea537281d76a80ec25dc3f9276eae7c1a95e3f3c Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Fri, 28 Feb 2014 14:01:14 -0800 Subject: [PATCH 01/10] Add class apt for manage_package_repo => true --- Gemfile | 7 ++++--- spec/acceptance/server_spec.rb | 16 ++++++++++++++-- spec/spec_helper_acceptance.rb | 20 +++++++++----------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 1cf440d..cb5deec 100644 --- a/Gemfile +++ b/Gemfile @@ -2,12 +2,13 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'rake' + gem 'pry', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'rspec-puppet', '< 1.0' gem 'puppet-lint', '~> 0.3.2' - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'serverspec', :require => false end if puppetversion = ENV['PUPPET_GEM_VERSION'] diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb index 1d34729..b8456ee 100644 --- a/spec/acceptance/server_spec.rb +++ b/spec/acceptance/server_spec.rb @@ -54,6 +54,15 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f after :all do psql('--command="drop database postgresql_test_db" postgres', 'postgres') pp = <<-EOS.unindent + if $::osfamily == 'Debian' { + class { 'apt': } + # XXX Need to purge postgresql-common after uninstalling 9.3 because + # it leaves the init script behind. Poor packaging. + package { 'postgresql-common': + ensure => purged, + require => Class['postgresql::server'], + } + } class { 'postgresql::globals': ensure => absent, manage_package_repo => true, @@ -63,11 +72,14 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f ensure => absent, } EOS - apply_manifest(pp, :catch_failures => true) + expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('') end it 'perform installation and create a db' do pp = <<-EOS.unindent + if $::osfamily == 'Debian' { + class { 'apt': } + } class { "postgresql::globals": version => "9.3", manage_package_repo => true, @@ -85,7 +97,7 @@ describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(f } EOS - apply_manifest(pp, :catch_failures => true) + expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('') apply_manifest(pp, :catch_changes => true) shell('test -d /tmp/pg_xlogs') do |r| diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 088aaf4..8875b1c 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -34,17 +34,14 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0], &block) shell("su #{shellescape(user)} -c #{shellescape(psql)}", :acceptable_exit_codes => exit_codes, &block) end -hosts.each do |host| - if host['platform'] =~ /debian/ - on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc' - end - if host.is_pe? - install_pe - else - # Install Puppet - install_package host, 'rubygems' - on host, 'gem install puppet --no-ri --no-rdoc' - on host, "mkdir -p #{host['distmoduledir']}" +unless ENV['RS_PROVISION'] == 'no' + hosts.each do |host| + if host.is_pe? + install_pe + else + install_puppet + on host, "mkdir -p #{host['distmoduledir']}" + end end end @@ -62,6 +59,7 @@ RSpec.configure do |c| # Install module and dependencies puppet_module_install(:source => proj_root, :module_name => 'postgresql') hosts.each do |host| + shell("/bin/touch #{default['puppetpath']}/hiera.yaml") on host, shell('chmod 755 /root') if fact('osfamily') == 'Debian' shell("echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen") From d259acc4104c4d42b3e012218a03e6e97560af56 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Sat, 1 Mar 2014 01:51:09 +0000 Subject: [PATCH 02/10] Use the correct encoding. --- spec/acceptance/server/db_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/server/db_spec.rb b/spec/acceptance/server/db_spec.rb index c6ad693..0287976 100644 --- a/spec/acceptance/server/db_spec.rb +++ b/spec/acceptance/server/db_spec.rb @@ -39,7 +39,7 @@ describe 'postgresql::server::db', :unless => UNSUPPORTED_PLATFORMS.include?(fac user => 'test1', password => postgresql_password('test1', 'test1'), encoding => 'UTF8', - locale => 'en_NG', + locale => 'en_NG.UTF-8', } EOS From 61255f1cc738da1bd5831e1db6aac8fd75a81980 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Fri, 28 Feb 2014 21:09:55 -0800 Subject: [PATCH 03/10] Correct spec helper commands --- spec/spec_helper_acceptance.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 8875b1c..4984da6 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -59,12 +59,12 @@ RSpec.configure do |c| # Install module and dependencies puppet_module_install(:source => proj_root, :module_name => 'postgresql') hosts.each do |host| - shell("/bin/touch #{default['puppetpath']}/hiera.yaml") - on host, shell('chmod 755 /root') + on host, "/bin/touch #{default['puppetpath']}/hiera.yaml" + on host, 'chmod 755 /root' if fact('osfamily') == 'Debian' - shell("echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen") - shell('/usr/sbin/locale-gen') - shell('/usr/sbin/update-locale') + on host, "echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen" + on host, '/usr/sbin/locale-gen' + on host, '/usr/sbin/update-locale' end on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] } on host, puppet('module','install','puppetlabs-firewall'), { :acceptable_exit_codes => [0,1] } From 46e455075d7569ea6dd632be7533ae9f08ed51d3 Mon Sep 17 00:00:00 2001 From: Lauren Rother Date: Sun, 2 Mar 2014 12:13:07 -0800 Subject: [PATCH 04/10] Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries Per a request to have initial release notes that specifically listed known issues for this PE 3.2 release, and barred by time constraints from automating a pull from open issues in JIRA, this commit adds a Release Note and Known Bug section to the Changelog for the imminent 3.2 release. As it will display on the Forge, updates file type to markdown and standardizes previous entries. Adds template for release notes to be filled in later. --- Changelog => Changelog.md | 132 ++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 61 deletions(-) rename Changelog => Changelog.md (95%) diff --git a/Changelog b/Changelog.md similarity index 95% rename from Changelog rename to Changelog.md index a77a361..fc1278b 100644 --- a/Changelog +++ b/Changelog.md @@ -1,10 +1,23 @@ -2014-02-12 - Version 3.3.1 -Bugfix: +##2014-03-04 - Supported Release 3.3.x +###Summary + +####Features + +####Bugfixes + +####Known Bugs + +* SLES is not supported. + + +##2014-02-12 - Version 3.3.1 +####Bugfix: - Allow dynamic rubygems host -2014-01-28 - Version 3.3.0 -Summary: +##2014-01-28 - Version 3.3.0 + +###Summary This release rolls up a bunch of bugfixes our users have found and fixed for us over the last few months. This improves things for 9.1 users, and makes @@ -13,14 +26,14 @@ this module usable on FreeBSD. This release is dedicated to 'bma', who's suffering with Puppet 3.4.1 issues thanks to Puppet::Util::SUIDManager.run_and_capture. -Features: +####Features - Add lc_ config entry settings - Can pass template at database creation. - Add FreeBSD support. - Add support for customer `xlogdir` parameter. - Switch tests from rspec-system to beaker. (This isn't really a feature) -Bugfixes: +####Bugfixes - Properly fix the deprecated Puppet::Util::SUIDManager.run_and_capture errors. - Fix NOREPLICATION option for Postgres 9.1 - Wrong parameter name: manage_pg_conf -> manage_pg_hba_conf @@ -33,26 +46,27 @@ Bugfixes: - Add some missing privileges. - Remove deprecated and unused concat::fragment parameters. -2013-11-05 - Version 3.2.0 -Summary: +##2013-11-05 - Version 3.2.0 + +###Summary Add's support for Ubuntu 13.10 (and 14.04) as well as x, y, z. -Features: +####Features - Add versions for Ubuntu 13.10 and 14.04. - Use default_database in validate_db_connection instead of a hardcoded 'postgres' - Add globals/params layering for default_database. - Allow specification of default database name. -Bugs: +####Bugs - Fixes to the README. -2013-10-25 - Version 3.1.0 +##2013-10-25 - Version 3.1.0 -Summary: +###Summary This is a minor feature and bug fix release. @@ -62,12 +76,12 @@ The default version of Fedora 17 has now been added, so that Fedora 17 users can And finally we've extended the capabilities of the defined type postgresql::validate_db_connection so that now it can handle retrying and sleeping between retries. This feature has been monopolized to fix a bug we were seeing with startup race conditions, but it can also be used by remote systems to 'wait' for PostgreSQL to start before their Puppet run continues. -Features: +####Features - Defined $default_version for Fedora 17 (Bret Comnes) - add search_path attribute to postgresql_psql resource (Jeremy Kitchen) - (GH-198) Add wait and retry capability to validate_db_connection (Ken Barber) -Bugs: +####Bugs - enabling defined postgres user password without resetting on every puppet run (jonoterc) - periods are valid in configuration variables also (Jeremy Kitchen) - Add zero length string to join() function (Jarl Stefansson) @@ -76,34 +90,37 @@ Bugs: - Remove concat::setup for include in preparation for the next concat release (Ken Barber) -2013-10-14 - Version 3.0.0 +##2013-10-14 - Version 3.0.0 Final release of 3.0, enjoy! -2013-10-14 - Version 3.0.0-rc3 -Summary: +##2013-10-14 - Version 3.0.0-rc3 + +###Summary Add a parameter to unmanage pg_hba.conf to fix a regression from 2.5, as well as allowing owner to be passed into x. -Features: +####Features - `manage_pg_hba_conf` parameter added to control pg_hba.conf management. - `owner` parameter added to server::db. -2013-10-09 - Version 3.0.0-rc2 -Summary: +##2013-10-09 - Version 3.0.0-rc2 + +###Summary A few bugfixes have been found since -rc1. -Fixes: +####Fixes - Special case for $datadir on Amazon - Fix documentation about username/password for the postgresql_hash function -2013-10-01 - Version 3.0.0-rc1 -Summary: +##2013-10-01 - Version 3.0.0-rc1 + +###Summary Version 3 was a major rewrite to fix some internal dependency issues, and to make the new Public API more clear. As a consequence a lot of things have @@ -224,67 +241,60 @@ The older concat module is now deprecated and moved into the you may need to intervene during the installing of this package - as both use the same `concat` namespace. -2013-09-09 Release 2.5.0 -======================= +--- +##2013-09-09 Release 2.5.0 -Summary -------- +###Summary The focus of this release is primarily to capture the fixes done to the types and providers to make sure refreshonly works properly and to set the stage for the large scale refactoring work of 3.0.0. -Features --------- +####Features -Bugfixes --------- + +####Bugfixes - Use boolean for refreshonly. - Fix postgresql::plperl documentation. - Add two missing parameters to config::beforeservice - Style fixes -2013-08-01 Release 2.4.1 -======================== +##2013-08-01 Release 2.4.1 -Summary -------- +###Summary This minor bugfix release solves an idempotency issue when using plain text passwords for the password_hash parameter for the postgresql::role defined type. Without this, users would continually see resource changes everytime your run Puppet. -Bugfixes ---------- +####Bugfixes - Alter role call not idempotent with cleartext passwords (Ken Barber) -2013-07-19 Release 2.4.0 -======================== -Summary -------- +##2013-07-19 Release 2.4.0 + +###Summary + This updates adds the ability to change permissions on tables, create template databases from normal databases, manage PL-Perl's postgres package, and disable the management of `pg_hba.conf`. -Features --------- +####Features - Add `postgresql::table_grant` defined resource - Add `postgresql::plperl` class - Add `manage_pg_hba_conf` parameter to the `postgresql::config` class - Add `istemplate` parameter to the `postgresql::database` define -Bugfixes --------- +####Bugfixes - Update `postgresql::role` class to be able to update roles when modified instead of only on creation. - Update tests - Fix documentation of `postgresql::database_grant` -2.3.0 -===== + +##2.3.0 This feature release includes the following changes: @@ -295,8 +305,8 @@ This feature release includes the following changes: (Chris Price) * Improved integration testing (Ken Barber) -2.2.1 -===== + +##2.2.1 This release fixes a bug whereby one of our shell commands (psql) were not ran from a globally accessible directory. This was causing permission denied errors when the command attempted to change user without changing directory. @@ -310,8 +320,8 @@ This patch should correct that. * Set /tmp as default CWD for postgresql_psql -2.2.0 -===== + +##2.2.0 This feature release introduces a number of new features and bug fixes. @@ -345,8 +355,9 @@ This release in particular has largely been contributed by the community members * Allow SQL commands to be run against a specific DB (Carlos Villela) * Drop trailing comma to support Puppet 2.6 (Michael Arnold) -2.1.1 -===== + +##2.1.1 + This release provides a bug fix for RHEL 5 and Centos 5 systems, or specifically systems using PostgreSQL 8.1 or older. On those systems one would have received the error: @@ -364,8 +375,8 @@ This bug is due to a new feature we had added in 2.1.0, whereby the `include` di * Only install `include` directive and included file on PostgreSQL >= 8.2 * Add system tests for Centos 5 -2.1.0 -===== + +##2.1.0 This release is primarily a feature release, introducing some new helpful constructs to the module. @@ -448,8 +459,8 @@ A big thanks to all those listed below who made this feature release possible :- 2013-02-15 - Erik Dalén * Fix case whereby we were modifying a hash after creation -2.0.1 -===== + +##2.0.1 Minor bugfix release. @@ -459,8 +470,7 @@ Minor bugfix release. 2013-01-15 - Jordi Boggiano * Add support for ubuntu 12.10 status (3504405) -2.0.0 -===== +##2.0.0 Many thanks to the following people who contributed patches to this release: @@ -513,9 +523,9 @@ Notable features: * Many other bug fixes and improvements! +--- +##1.0.0 -1.0.0 -===== 2012-09-17 - Version 0.3.0 released 2012-09-14 - Chris Price From 856a46d2a9e256b054b4b409333c2d34710e3123 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Mon, 3 Mar 2014 17:12:17 +0000 Subject: [PATCH 05/10] Prepare metadata for supported modules release. --- metadata.json | 82 ++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/metadata.json b/metadata.json index 19fb328..2bfd442 100644 --- a/metadata.json +++ b/metadata.json @@ -1,42 +1,50 @@ { - "name": "puppetlabs/postgresql", - "version": "3.3.0", - "summary": "PostgreSQL", - "source": "git://github.com/puppetlabs/puppetlabs-postgresql.git", - "project_page": "http://github.com/puppetlabs/puppetlabs-postgresql", - "author": "Puppet Labs", - "license": "Apache-2.0", "operatingsystem_support": [ - "RedHat", - "OpenSUSE", - "SLES", - "SLED", - "Debian", - "Ubuntu" + { + "operatingsystem": "RedHat", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "CentOS", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "OracleLinux", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "Scientific", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "Debian", + "operatingsystemrelease": [ + "6", + "7" + ] + }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "10.04", + "12.04" + ] + } ], - "puppet_version": [ - "2.7", - "3.0", - "3.1", - "3.2", - "3.3" - ], - "dependencies": [ - { - "name": "puppetlabs/stdlib", - "version_requirement": ">=3.2.0 <5.0.0" - }, - { - "name": "puppetlabs/concat", - "version_requirement": ">= 1.0.0 <2.0.0" - }, - { - "name": "puppetlabs/apt", - "version_requirement": ">=1.1.0 <2.0.0" - }, - { - "name": "puppetlabs/firewall", - "version_requirement": ">= 0.0.4" - } + "requirements": [ + { "name": "pe", "version_requirement": "3.2.x" }, + { "name": "puppet", "version_requirement": "3.x" } ] } From 7dfa304e97fe7fce8b154e793d1ca1c9ca8e1846 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 3 Mar 2014 11:35:23 -0800 Subject: [PATCH 06/10] Supported Release 3.3.2 Summary This is a supported release. It fixes a problem with updating passwords on postgresql.org distributed versions of PostgreSQL. Bugfixes - Correct psql path when setting password on custom versions. - Documentation updates - Test updates Known Bugs * SLES is not supported. --- Changelog.md => CHANGELOG.md | 9 +++++---- Modulefile | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) rename Changelog.md => CHANGELOG.md (98%) diff --git a/Changelog.md b/CHANGELOG.md similarity index 98% rename from Changelog.md rename to CHANGELOG.md index fc1278b..af4739b 100644 --- a/Changelog.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ -##2014-03-04 - Supported Release 3.3.x +##2014-03-04 - Supported Release 3.3.2 ###Summary - -####Features +This is a supported release. It fixes a problem with updating passwords on postgresql.org distributed versions of PostgreSQL. ####Bugfixes +- Correct psql path when setting password on custom versions. +- Documentation updates +- Test updates ####Known Bugs - * SLES is not supported. diff --git a/Modulefile b/Modulefile index b850e1b..09f5379 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-postgresql' -version '3.3.1' +version '3.3.2' source 'git://github.com/puppetlabs/puppet-postgresql.git' author 'Inkling/Puppet Labs' description 'PostgreSQL defined resource types' From fabcb78e3cbd099704ccd73457e5103c35e5f127 Mon Sep 17 00:00:00 2001 From: Lauren Rother Date: Mon, 3 Mar 2014 12:36:07 -0800 Subject: [PATCH 07/10] Add install instructions for supported module version Adds a section to Setup for PE 3.2 users wanting to use the supported vs. shipped version of this module. --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 01bc41b..7a26cb9 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Table of Contents 1. [Overview - What is the PostgreSQL module?](#overview) 2. [Module Description - What does the module do?](#module-description) 3. [Setup - The basics of getting started with PostgreSQL module](#setup) + * [PE 3.2 supported module](#pe-3.2-supported-module) + * [Configuring the server](#configuring-the-server) 4. [Usage - How to use the module for various tasks](#usage) 5. [Upgrading - Guide for upgrading from older revisions of this module](#upgrading) 6. [Reference - The classes, defines,functions and facts available in this module](#reference) @@ -47,6 +49,15 @@ The postgresql module offers many security configuration settings. Before gettin Your answers to these questions will determine which of the module's parameters you'll want to specify values for. +###PE 3.2 supported module + +PE 3.2 introduces Puppet Labs supported modules. The version of the postgresql module that ships within PE 3.2 is supported via normal [Puppet Enterprise support](http://puppetlabs.com/services/customer-support) channels. If you would like to access the [supported module](http://forge.puppetlabs.com/supported) version, you will need to uninstall the shipped module and install the supported version from the Puppet Forge. You can do this by first running + + # puppet module uninstall puppetlabs-postgresql +and then running + + # puppet module install puppetlabs/postgresql + ###Configuring the server The main configuration you'll need to do will be around the `postgresql::server` class. The default parameters are reasonable, but fairly restrictive regarding permissions for who can connect and from where. To manage a PostgreSQL server with sane defaults: From b79ea115c6bdf3ac7fe17a60dbfc4caeeb143d10 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 3 Mar 2014 13:44:29 -0800 Subject: [PATCH 08/10] Patch metadata --- metadata.json | 128 +++++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 48 deletions(-) diff --git a/metadata.json b/metadata.json index 2bfd442..2d4b7a7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,50 +1,82 @@ { - "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "5", - "6" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "5", - "6" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "5", - "6" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "5", - "6" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "6", - "7" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "10.04", - "12.04" - ] - } - ], - "requirements": [ - { "name": "pe", "version_requirement": "3.2.x" }, - { "name": "puppet", "version_requirement": "3.x" } - ] + "operatingsystem_support": [ + { + "operatingsystem": "RedHat", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "CentOS", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "OracleLinux", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "Scientific", + "operatingsystemrelease": [ + "5", + "6" + ] + }, + { + "operatingsystem": "Debian", + "operatingsystemrelease": [ + "6", + "7" + ] + }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "10.04", + "12.04" + ] + } + ], + "requirements": [ + { + "name": "pe", + "version_requirement": "3.2.x" + }, + { + "name": "puppet", + "version_requirement": "3.x" + } + ], + "name": "puppetlabs-postgresql", + "version": "3.3.2", + "source": "git://github.com/puppetlabs/puppet-postgresql.git", + "author": "Inkling/Puppet Labs", + "license": "ASL 2.0", + "summary": "PostgreSQL defined resource types", + "description": "PostgreSQL defined resource types", + "project_page": "https://github.com/puppetlabs/puppet-postgresql", + "dependencies": [ + { + "name": "puppetlabs/stdlib", + "version_requirement": ">=3.2.0 <5.0.0" + }, + { + "name": "puppetlabs/firewall", + "version_requirement": ">= 0.0.4" + }, + { + "name": "puppetlabs/apt", + "version_requirement": ">=1.1.0 <2.0.0" + }, + { + "name": "puppetlabs/concat", + "version_requirement": ">= 1.0.0 <2.0.0" + } + ] } From 0aba3228d2fa766d5fa064a91607a8db27f595d0 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Tue, 4 Mar 2014 16:17:33 +0000 Subject: [PATCH 09/10] Replace the symlink with the actual file to resolve a PMT issue. --- spec/acceptance/nodesets/default.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) mode change 120000 => 100644 spec/acceptance/nodesets/default.yml diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 120000 index 2719644..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1 +0,0 @@ -centos-64-x64.yml \ No newline at end of file diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml new file mode 100644 index 0000000..0639835 --- /dev/null +++ b/spec/acceptance/nodesets/default.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-64-x64: + roles: + - master + platform: el-6-x86_64 + box : centos-64-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + type: git From d7a890b4a90e7699d2362f129980bfc9dec624cc Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Tue, 4 Mar 2014 16:40:55 +0000 Subject: [PATCH 10/10] Prepare 3.3.3 supported release. --- CHANGELOG.md | 12 ++++++++++++ Modulefile | 2 +- metadata.json | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af4739b..5f70a34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +##2014-03-04 - Supported Release 3.3.3 +###Summary + +This is a supported release. This release removes a testing symlink that can +cause trouble on systems where /var is on a seperate filesystem from the +modulepath. + +####Features +####Bugfixes +####Known Bugs +* SLES is not supported. + ##2014-03-04 - Supported Release 3.3.2 ###Summary This is a supported release. It fixes a problem with updating passwords on postgresql.org distributed versions of PostgreSQL. diff --git a/Modulefile b/Modulefile index 09f5379..e0e9354 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-postgresql' -version '3.3.2' +version '3.3.3' source 'git://github.com/puppetlabs/puppet-postgresql.git' author 'Inkling/Puppet Labs' description 'PostgreSQL defined resource types' diff --git a/metadata.json b/metadata.json index 2d4b7a7..3da197d 100644 --- a/metadata.json +++ b/metadata.json @@ -54,7 +54,7 @@ } ], "name": "puppetlabs-postgresql", - "version": "3.3.2", + "version": "3.3.3", "source": "git://github.com/puppetlabs/puppet-postgresql.git", "author": "Inkling/Puppet Labs", "license": "ASL 2.0",