From 07053b7901f3a895a1a427687a1f24a4ec429801 Mon Sep 17 00:00:00 2001 From: Andrew Roetker Date: Mon, 14 Mar 2016 12:25:41 -0700 Subject: [PATCH] (maint) Prep module for v5.1.2 release This commit adds release notes and some README cleanups for a v5.1.2 release of the module for the CentOS terminus upgrade fix. --- CHANGELOG | 11 +++++++++++ README.md | 34 ++++++++++++++++++---------------- metadata.json | 2 +- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c75e005..d9b0f32 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,17 @@ Release notes for the puppetlabs-puppetdb module. +#### 5.1.2 - 2016/03/14 + +This is a minor bugfix release. + +Detailed changes: + +* Support RHEL upgrades from the `puppetdb-terminus` (<= PuppetDB 2) to the +`puppetdb-termini` (>= PuppetDB 3). + +------------------------------------------ + #### 5.1.1 - 2016/02/09 This is a minor bugfix release. diff --git a/README.md b/README.md index 0a28aa2..6405538 100644 --- a/README.md +++ b/README.md @@ -164,8 +164,8 @@ It is worth noting that there are some cross-node dependencies, which means that the first time you add the module's configurations to your manifests, you may see a few failed puppet runs on the affected nodes. -PuppetDB handles cross-node dependencies by taking a sort of “eventual -consistency” approach. There’s nothing that the module can do to control the +PuppetDB handles cross-node dependencies by taking a sort of "eventual +consistency" approach. There’s nothing that the module can do to control the order in which your nodes check in, but the module can check to verify that the services it depends on are up and running before it makes configuration changes--so that’s what it does. @@ -190,29 +190,31 @@ You can also manually trigger puppet runs on the nodes in the correct order Upgrading --------- -###Upgrading from 4.x to version 5.x +### Upgrading from 4.x to 5.x Significant parameter changes are listed below: -* The PuppetDB module now supports PuppetDB 3.0.0 by default -* The PuppetDB module now manages Postgres repos by default. To turn this - behavior off, set `manage_package_repo` to false. -* If you want to use 5.x of the module with PuppetDB 2.x, you'll need to use the - new `puppetdb::globals` class to set the version of PuppetDB you're using - explicitly. The ability to configure the version has been therefore moved out - of the `puppetdb` and `puppetdb::server` classes. +* The PuppetDB module defaults to Puppet 4 pathing and assumes `puppetserver` + is the master service by default +* The PuppetDB module manages Postgres repos by default. To turn this behavior + off, set `manage_package_repo` to `false`. +* To specify a specific version of PuppetDB to manage, you'll need to use the + `puppetdb::globals` class to set the version of PuppetDB you're using + explicitly. The ability to configure the version in the `puppetdb::server` and + `puppetdb` class have been removed. For example if your config looked like this before: class {'puppetdb': - puppetdb_version => '2.3.5-1.el7', + puppetdb_version => '3.2.4-1.el7', } class { 'puppetdb::master::config': } -and you'd still like to use the module with PuppetDB 2.3.5, all you'd have to change would be: +and you'd still like to use the module with PuppetDB 3.2.4, all you'd have to +change would be: class { 'puppetdb::globals': - version => '2.3.5-1.el7', + version => '3.2.4-1.el7', } class { 'puppetdb' : } class { 'puppetdb::master::config' : } @@ -230,7 +232,7 @@ The `globals` class above takes into account the following PuppetDB 3 and Puppet See the CHANGELOG file for more detailed information on changes for each release. -###Upgrading from 3.x to version 4.x +### Upgrading from 3.x to 4.x For this release, all dependency versions have been bumped to their latest. Significant parameter changes are listed below: @@ -247,7 +249,7 @@ Significant parameter changes are listed below: See the CHANGELOG file for more detailed information on changes for each release. -###Upgrading from 2.x to version 3.x +### Upgrading from 2.x to 3.x For this release a major dependency has changed. The module `pupppetlabs/postgresql` must now be version 3.x. Upgrading the module should @@ -271,7 +273,7 @@ Some other changes include: * The class `puppetdb::server::jetty_ini` and `puppetdb::server::database_ini` have been marked as private, do not use it directly. -###Upgrading from 1.x to version 2.x +### Upgrading from 1.x to 2.x A major dependency has been changed, so now when you upgrade to 2.0 the dependency `cprice404/inifile` has been replaced with `puppetlabs/inifile`. This diff --git a/metadata.json b/metadata.json index 26be6c6..678c81a 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-puppetdb", - "version": "5.1.1", + "version": "5.1.2", "summary": "Installs PostgreSQL and PuppetDB, sets up the connection to Puppet master.", "source": "git://github.com/puppetlabs/puppetlabs-puppetdb.git", "project_page": "http://github.com/puppetlabs/puppetlabs-puppetdb",