Merge pull request #33 from justindowning/upgrade-and-fix

Upgrade and fix various components

Author: jdowning

Puppetfile

@@ -1,8 +1,10 @@
 forge 'https://forgeapi.puppetlabs.com'
 
+mod 'puppetlabs/apt',
+  :git => "git://github.com/puppetlabs/puppetlabs-apt.git"
 mod 'stahnma/epel',
   :git => "git://github.com/stahnma/puppet-module-epel.git"
-mod 'puppetlabs/nodejs',
-  :git => "git://github.com/puppetlabs/puppetlabs-nodejs.git"
+mod 'puppet/nodejs',
+  :git => "git://github.com/puppet-community/puppet-nodejs.git"
 mod 'puppetlabs/stdlib',
   :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git"

Puppetfile.lock

@@ -1,34 +1,42 @@
 FORGE
   remote: https://forgeapi.puppetlabs.com
   specs:
-    puppetlabs-apt (1.7.0)
-      puppetlabs-stdlib (>= 2.2.1)
+    treydock-gpg_key (0.0.3)
 
 GIT
-  remote: git://github.com/puppetlabs/puppetlabs-nodejs.git
+  remote: git://github.com/puppet-community/puppet-nodejs.git
   ref: master
-  sha: 003933504245f1087c4c8cfcbc3d9b6097b228a1
+  sha: 240817d3f57256b387c9adc2cfdda586353db52b
   specs:
-    puppetlabs-nodejs (0.6.1)
-      puppetlabs-apt (>= 0.0.3)
-      puppetlabs-stdlib (>= 2.0.0)
+    puppet-nodejs (1.2.0)
+      puppetlabs-stdlib (< 5.0.0, >= 4.1.0)
+      treydock-gpg_key (< 1.0.0, >= 0.0.3)
+
+GIT
+  remote: git://github.com/puppetlabs/puppetlabs-apt.git
+  ref: master
+  sha: 3df188f879d35836ec0c14298c5dbec06179dd18
+  specs:
+    puppetlabs-apt (2.1.1)
+      puppetlabs-stdlib (< 5.0.0, >= 4.5.0)
 
 GIT
   remote: git://github.com/puppetlabs/puppetlabs-stdlib.git
   ref: master
-  sha: 79e79e8bbad5f3226b51fae5a2a64bc9a84031ae
+  sha: 1d89df906e1ae1d09a862974181663caaf8012c6
   specs:
-    puppetlabs-stdlib (4.5.0)
+    puppetlabs-stdlib (4.8.0)
 
 GIT
   remote: git://github.com/stahnma/puppet-module-epel.git
   ref: master
-  sha: 7322b80c268087bc4b967a9a6ca29923853971f8
+  sha: 370922ee1e4522524c9d00f099c1882a00938b30
   specs:
-    stahnma-epel (1.0.2)
+    stahnma-epel (1.1.0)
 
 DEPENDENCIES
-  puppetlabs-nodejs (>= 0)
+  puppet-nodejs (>= 0)
+  puppetlabs-apt (>= 0)
   puppetlabs-stdlib (>= 0)
   stahnma-epel (>= 0)
 

README.md

@@ -12,7 +12,7 @@ This Puppet module will install [statsd](https://github.com/etsy/statsd/) on Deb
 
 ## Requirements
 
-This module assumes nodejs & npm is installed on the host, but will not do it for you. I recommend using [puppetlabs/nodejs](https://github.com/puppetlabs/puppetlabs-nodejs) to set this up.
+This module assumes nodejs & npm is installed on the host, but will not do it for you. I recommend using [puppet/nodejs](https://github.com/puppet-community/puppet-nodejs) to set this up.
 
 ## Usage
 ```puppet

Vagrantfile

@@ -6,22 +6,17 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder "modules", "/tmp/puppet-modules", type: "rsync", rsync__exclude: ".git/"
   config.vm.synced_folder ".", "/tmp/puppet-modules/statsd", type: "rsync", rsync__exclude: ".git/"
 
+  config.vm.provision :puppet do |puppet|
+    puppet.environment_path = "tests"
+    puppet.environment = "vagrant"
+    puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
+  end
+
   config.vm.define "centos" do |centos|
-    centos.vm.box     = 'puppetlabs/centos-7.0-64-puppet'
-    centos.vm.provision :puppet do |puppet|
-      puppet.manifests_path = "tests/vagrant"
-      puppet.manifest_file  = "centos.pp"
-      puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
-    end
+    centos.vm.box = 'puppetlabs/centos-7.0-64-puppet'
   end
 
   config.vm.define "ubuntu", primary: true do |ubuntu|
-    ubuntu.vm.box     = 'puppetlabs/ubuntu-14.04-64-puppet'
-    ubuntu.vm.provision :shell, :inline => "echo 'Updating apt...' && apt-get update -qq"
-    ubuntu.vm.provision :puppet do |puppet|
-      puppet.manifests_path = "tests/vagrant"
-      puppet.manifest_file  = "ubuntu.pp"
-      puppet.options        = ["--modulepath", "/tmp/puppet-modules"]
-    end
+    ubuntu.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
   end
 end

manifests/config.pp

@@ -32,6 +32,7 @@
   $influxdb_database                 = $statsd::influxdb_database,
   $influxdb_username                 = $statsd::influxdb_username,
   $influxdb_password                 = $statsd::influxdb_password,
+  $influxdb_version                  = $statsd::influxdb_version,
   $influxdb_flush                    = $statsd::influxdb_flush,
   $influxdb_proxy                    = $statsd::influxdb_proxy,
   $influxdb_proxy_suffix             = $statsd::influxdb_proxy_suffix,
@@ -47,6 +48,7 @@
   $librato_includeMetrics            = $statsd::librato_includeMetrics,
   $librato_excludeMetrics            = $statsd::librato_excludeMetrics,
   $librato_globalPrefix              = $statsd::librato_globalPrefix,
+  $librato_alwaysSuffixPercentile    = $statsd::librato_alwaysSuffixPercentile,
   $stackdriver_apiKey                = $statsd::stackdriver_apiKey,
   $stackdriver_source                = $statsd::stackdriver_source,
   $stackdriver_sourceFromPrefix      = $statsd::stackdriver_sourceFromPrefix,

metadata.json

@@ -10,8 +10,7 @@
   "source": "https://github.com/justindowning/puppet-statsd.git",
   "issues_url": "https://github.com/justindowning/puppet-statsd/issues",
   "dependencies": [
-    { "name": "puppetlabs/stdlib", "version_requirement": ">=4.1.0 <5.0.0" },
-    { "name": "stahnma/epel", "version_requirement": ">1.0.0 <2.0.0" }
+    { "name": "puppetlabs/stdlib", "version_requirement": ">=4.1.0 <5.0.0" }
   ],
   "operatingsystem_support": [
     {
@@ -40,7 +39,7 @@
     }
   ],
   "requirements": [
-    { "name": "pe", "version_requirement": "3.x" },
-    { "name": "puppet", "version_requirement": "3.x" }
+    { "name": "pe", "version_requirement": ">=3" },
+    { "name": "puppet", "version_requirement": ">=3" }
   ]
 }

tests/vagrant/environment.conf

@@ -0,0 +1 @@
+environment_timeout=0

tests/vagrant/centos.pp renamed to tests/vagrant/manifests/site.pp

@@ -1,5 +1,9 @@
-class { 'epel': }->
-class { 'nodejs': }->
+case $operatingsystem {
+  /^(Debian|Ubuntu)$/: { include apt }
+  'RedHat', 'CentOS':  { include epel }
+}
+
+class { 'nodejs': manage_package_repo => true }->
 class { 'statsd':
   backends              => [
     './backends/graphite',