Merge pull request #142 from kbarber/ticket/master/pdb-871-4-0-0-release

Ticket/master/pdb 871 4 0 0 release

.travis.yml

@@ -8,28 +8,15 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - ruby-head
+  - 2.1.1
 env:
   matrix:
-  - PUPPET_GEM_VERSION="~> 2.7"
-  - PUPPET_GEM_VERSION="~> 3.3"
-  - PUPPET_GEM_VERSION="> 3.3"
-  - PUPPET_GEM_VERSION="~> 3.5.0"
+  - PUPPET_GEM_VERSION="~> 3.7.1"
+  - PUPPET_GEM_VERSION="~> 3.7"
   global:
   - PUBLISHER_LOGIN=puppetlabs
   -  secure: "FInoEwh3G4Auqp+OOdIc20lDLqrV6FHzWsM8ercHWjhDRD23VI49B1qqehWjaI8lKM3D5mTvdup23IVQBJo8M0rR/yfju1NhMYFTQ5bcJIrbQ3fn4n/zSaE8gLTOtHwzjSlqTJAYjxOAnp1VdMZngqpU/RYfSk68zJD34NqfovA="
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 3.3"
 notifications:
   email: false

Modulefile

@@ -1,13 +0,0 @@
-name 'puppetlabs-puppetdb'
-version '3.0.1'
-source 'git://github.com/puppetlabs/puppetlabs-puppetdb.git'
-author 'Puppet Labs'
-description 'PuppetDB resource types'
-summary 'PuppetDB resource types'
-license 'ASL 2.0'
-project_page 'https://github.com/puppetlabs/puppetlabs-puppetdb'
-
-dependency 'puppetlabs/inifile', '1.x'
-dependency 'puppetlabs/postgresql', '>= 3.1.0 <4.0.0'
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/stdlib', '>= 3.1.0'

README.md

@@ -139,6 +139,20 @@ You can also manually trigger puppet runs on the nodes in the correct order (Pos
 Upgrading
 ---------
 
+###Upgrading from 3.x to version 4.x
+
+For this release, all dependency versions have been bumped to their latest. Significant parameter changes are listed below:
+
+* The PuppetDB module now only supports Puppet 3.7.1 or later
+* 'puppetlabs/postgresql' 4.0.0 or later is now required
+* 'puppetlabs/inifile' 1.1.3 or later is now required
+* 'puppetlabs/firewall' 1.1.3 or later is now required
+* 'puppetlabs/stdlib' 4.2.2 or later is now required
+* The parameter `manage_firewall` for the class `puppetdb::database::postgresql` has now been removed, since the postgresql module no longer supports this.
+* The parameter `open_postgres_port` for the class `puppetdb` has also been removed, due to postgresql changes.
+
+See the CHANGELOG file for more detailed information on changes for each release.
+
 ###Upgrading from 2.x to version 3.x
 
 For this release a major dependency has changed. The module `pupppetlabs/postgresql` must now be version 3.x. Upgrading the module should upgrade the `puppetlabs/postgresql` module for you, but if another module has a fixed dependency that module will have to be fixed before you can continue.
@@ -299,7 +313,7 @@ Example: to set `-Xmx512m -Xms256m` options use `{ '-Xmx' => '512m', '-Xms' => '
 
 ####`max_threads`
 
-Jetty option to explicetly set max-thread. The default is undef, so the PuppetDB-jetty default is used. 
+Jetty option to explicitly set max-thread. The default is undef, so the PuppetDB-jetty default is used.
 
 ####`read_database`
 
@@ -534,14 +548,17 @@ Limitations
 
 Currently, PuppetDB is compatible with:
 
-    Puppet Version: 2.7+
+    Puppet Version: 3.7.1+
 
 Platforms:
-* EL 6
-* Debian 6
-* Ubuntu 10.04
+* EL 5, 6, 7
+* Debian 6, 7
+* Ubuntu 10.04, 12.04, 14.04
+
+Community Maintained Platforms:
 * Archlinux
 * OpenBSD 5.6-current and newer
+* SLES 11 SP1
 
 Development
 ------------

metadata.json

@@ -2,38 +2,91 @@
     "name": "puppetlabs/puppetdb",
     "version": "3.0.1",
     "summary": "PuppetDB resource types",
-    "source": "git@github.com/puppetlabs/puppetlabs-puppetdb.git",
+    "source": "git://github.com/puppetlabs/puppetlabs-puppetdb.git",
     "project_page": "http://github.com/puppetlabs/puppetlabs-puppetdb",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
+    "author": "puppetlabs",
+    "license": "Apache 2.0",
+    "issues_url": "https://tickets.puppetlabs.com/browse/PDB",
+    "description": "Module for installing/configuring PuppetDB",
     "operatingsystem_support": [
-        "RedHat",
-        "Debian",
-        "Ubuntu"
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11 SP1"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    }
     ],
-    "puppet_version": [
-        "2.7",
-        "3.0",
-        "3.1",
-        "3.2",
-        "3.3"
+
+    "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">=3.7.1 <4.0.0"
+    }
     ],
+
     "dependencies": [
         {
             "name": "puppetlabs/inifile",
-            "version_requirement": "1.x"
+            "version_requirement": ">= 1.1.3 <2.0.0"
         },
         {
             "name": "puppetlabs/postgresql",
-            "version_requirement": ">=3.1.0 <4.0.0"
+            "version_requirement": ">= 4.0.0 <5.0.0"
         },
         {
             "name": "puppetlabs/firewall",
-            "version_requirement": ">= 0.0.4"
+            "version_requirement": ">= 1.1.3 <2.0.0"
         },
         {
             "name": "puppetlabs/stdlib",
-            "version_requirement": ">=3.1.0"
+            "version_requirement": ">= 4.2.2 <5.0.0"
         }
     ]
 }