Hackdna/neo4j repo key error (#1505)

* Update apt, nodejs, postgresql, rabbitmq and stdlib Puppet modules

* Remove unnecessary code

deployment/Puppetfile

@@ -1,12 +1,12 @@
 forge "https://forgeapi.puppetlabs.com"
 
-mod 'puppetlabs/apt', '1.8.0'
+mod 'puppet/nodejs', '2.1.0'
+mod 'puppetlabs/apt', '2.3.0'
 mod 'puppetlabs/limits', '0.1.0'
 mod 'puppetlabs/lvm', '0.7.0'
-mod 'puppetlabs/nodejs', '0.7.1'
-mod 'puppetlabs/postgresql', '4.3.0'
-mod 'puppetlabs/rabbitmq', '5.1.0'
-mod 'puppetlabs/stdlib', '4.5.1'
+mod 'puppetlabs/postgresql', '4.8.0'
+mod 'puppetlabs/rabbitmq', '5.6.0'
+mod 'puppetlabs/stdlib', '4.13.1'
 mod 'saz/timezone', '3.2.0'
 mod 'stankevich/python', '1.9.1'
 mod 'thias/sysctl', '1.0.2'

deployment/refinery-modules/refinery/manifests/init.pp

@@ -252,13 +252,16 @@
     location    => 'http://debian.neo4j.org/repo',
     release     => 'stable/',
     repos       => '',
-    key         => '1EEFB8767D4924B86EAD08A459D700E4D37F5F19',
-    key_source  => 'https://debian.neo4j.org/neotechnology.gpg.key',
-    include_src => false,
+    key         => {
+      'id'     => '1EEFB8767D4924B86EAD08A459D700E4D37F5F19',
+      'source' => 'https://debian.neo4j.org/neotechnology.gpg.key',
+    },
   }
   ->
   package { 'neo4j':
-    ensure => '2.3.1',
+    ensure  => '2.3.1',
+    # https://forge.puppet.com/puppetlabs/apt/readme#adding-new-sources-or-ppas
+    require => Class['apt::update'],
   }
   ->
   limits::fragment {
@@ -333,13 +336,6 @@
 }
 include owl2neo4j
 
-include apt
-# workaround for https://github.com/parklab/refinery-platform/issues/1181
-apt::key { 'rabbitmq':
-  key    => '0A9AF2115F4687BD29803A206B73A36E6026DFCA',
-  before => Class['::rabbitmq']
-}
-
 include '::rabbitmq'
 
 class ui {
@@ -349,16 +345,21 @@
     location    => 'https://deb.nodesource.com/node_6.x',
     release     => 'trusty',
     repos       => 'main',
-    key         => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
-    key_server  => 'keyserver.ubuntu.com',
-    include_src => true,
-    include_deb => true
+    key         => {
+      'id'     => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
+      'server' => 'keyserver.ubuntu.com',
+    },
+    include => {
+      'src' => true,
+      'deb' => true,
+    },
   }
-
+  ->
   package { 'nodejs':
     name    => 'nodejs',
     ensure  => latest,
-    require => Apt::Source['nodejs']
+    # https://forge.puppet.com/puppetlabs/apt/readme#adding-new-sources-or-ppas
+    require => Class['apt::update'],
   }
   ->
   package {