Enable Stx reqquired puppet modules

Following puppet modules are enabled now: - puppet-barbican - puppet-boolean - puppet-ceph - puppet-certmonger - puppet-collectd - puppet-dnsmasq.bb - puppet-drbd - puppet-etcd - puppet-filemapper - puppet-horizon - puppet-keystone - puppet-kmod - puppetlabs-apache - puppetlabs-concat - puppetlabs-create-resources - puppetlabs-firewall - puppetlabs-haproxy - puppetlabs-inifile.bb - puppetlabs-lvm - puppetlabs-mysql - puppetlabs-postgresql - puppetlabs-rabbitmq - puppetlabs-stdlib - puppet-ldap - puppet-memcached - puppet-network - puppet-nslcd - puppet-nssdb - puppet-openstacklib - puppet-oslo - puppet-puppi - puppet-staging - puppet-sysctl - puppet-vlan - puppet-vswitch
2019-10-31 18:49:11 -07:00 · 2019-10-31 18:49:11 -07:00 · 1ae6837731
commit 1ae6837731
parent 3eabb448e0
67 changed files with 839 additions and 245 deletions
--- a/recipes-support/puppet/.puppet-vlan_git.bb.swp
+++ b/recipes-support/puppet/.puppet-vlan_git.bb.swp
--- a/recipes-support/puppet/files/drbd/Add-gemspec.patch
+++ b/recipes-support/puppet/files/drbd/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-drbd.gemspec	2019-10-30 21:51:28.271880621 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-drbd'
+  s.version     = '0.3.1'
+  s.date        = '2016-12-30'
+  s.summary     = "DRBD Module"
+  s.description = s.summary
+  s.authors     = ["Vox Pupuli"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/voxpupuli/puppet-drbd'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/lvm/Add-gemspec.patch
+++ b/recipes-support/puppet/files/lvm/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-lvm.gemspec	2019-10-30 21:16:54.774974158 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppetlabs-lvm'
+  s.version     = '0.5.0'
+  s.date        = '2014-09-13'
+  s.summary     = "Provides Puppet types and providers to manage Logical Resource Management (LVM) features."
+  s.description = s.summary
+  s.authors     = ["Puppet Labs"]
+  s.email       = ''
+  s.files       = %w(metadata.json README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-lvm'
+  s.license     = 'GPL-2.0'
+ end
--- a/recipes-support/puppet/files/network/0001-Stx-uses-puppet-boolean-instead-of-adrien-boolean.patch
+++ b/recipes-support/puppet/files/network/0001-Stx-uses-puppet-boolean-instead-of-adrien-boolean.patch
@ -0,0 +1,26 @@
+From 0d6914c558620f8e82b2c84ce7bb4d35fdb882fd Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Thu, 31 Oct 2019 13:15:05 -0700
+Subject: [PATCH] Stx uses puppet-boolean instead of adrien-boolean
+
+Use puppet-boolean instead of adrien-boolean
+---
+ metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index 66dc6d7..2ca38b9 100644
+--- a/metadata.json
+++ b/metadata.json
+@@ -10,7 +10,7 @@
+   "dependencies": [
+   	{"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0 < 5.0.0"},
+ 	{"name":"adrien/filemapper","version_requirement":">= 1.1.0 < 5.0.0"},
+-	{"name":"adrien/boolean","version_requirement":">= 1.0.0"},
+	{"name":"puppet/boolean","version_requirement":">= 1.0.0"},
+ 	{"name":"camptocamp/kmod","version_requirement":">= 0.0.x"}
+   ]
+ }
+-- 
+2.17.1
+
--- a/recipes-support/puppet/files/network/Add-gemspec.patch
+++ b/recipes-support/puppet/files/network/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-network.gemspec	2019-10-30 21:12:14.606035966 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-network'
+  s.version     = '0.5.0'
+  s.date        = '2015-06-03'
+  s.summary     = "Manage non-volatile network configuration"
+  s.description = s.summary
+  s.authors     = ["Adrien Thebo <adrien@somethingsinistral.net>"]
+  s.email       = ''
+  s.files       = %w(Modulefile README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/adrienthebo/puppet-network'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/network/metadata.json._use_puppet_boolean.patch
+++ b/recipes-support/puppet/files/network/metadata.json._use_puppet_boolean.patch
@ -0,0 +1,12 @@
+diff -Nurpd a/metadata.json b/metadata.json
+--- a/metadata.json	2019-10-31 13:10:05.708520044 -0700
+++ b/metadata.json	2019-10-31 13:11:18.410910042 -0700
+@@ -10,7 +10,7 @@
+   "dependencies": [
+   	{"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0"},
+ 	{"name":"adrien/filemapper","version_requirement":">= 1.1.0"},
+-	{"name":"adrien/boolean","version_requirement":">= 1.0.0"},
+	{"name":"puppet/boolean","version_requirement":">= 1.0.0"},
+ 	{"name":"camptocamp/kmod","version_requirement":">= 0.0.x"}
+   ]
+ }
--- a/recipes-support/puppet/files/network/metadata.json.patch
+++ b/recipes-support/puppet/files/network/metadata.json.patch
@ -0,0 +1,19 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 13:07:35.519435748 -0700
+@@ -0,0 +1,16 @@
+{
+  "name": "adrien-network",
+  "version": "0.5.0",
+  "author": "Adrien Tehbo <adrien@somethingsinistral.net>",
+  "summary": "Manage non-volatile network configuration",
+  "license": "Apache-2.0",
+  "source": "https://github.com/adrienthebo/puppet-network",
+  "project_page": "https://github.com/adrienthebo/puppet-network",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+  	{"name":"puppetlabs/stdlib","version_requirement":">= 2.3.0 < 5.0.0"},
+	{"name":"adrien/filemapper","version_requirement":">= 1.1.0 < 5.0.0"},
+	{"name":"adrien/boolean","version_requirement":">= 1.0.0"},
+	{"name":"camptocamp/kmod","version_requirement":">= 0.0.x"}
+  ]
+}
--- a/recipes-support/puppet/files/postgresql/Add-gemspec.patch
+++ b/recipes-support/puppet/files/postgresql/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-postgresql.gemspec	2019-10-29 18:57:08.102259309 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppetlabs-postgresql'
+  s.version     = '4.8.0'
+  s.date        = '2016-12-22'
+  s.summary     = "Offers support for basic management of PostgreSQL databases."
+  s.description = s.summary
+  s.authors     = ["Inkling/Puppet Labs"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-postgresql'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-boolean/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-boolean/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-boolean.gemspec	2019-10-30 08:37:38.629069755 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-boolean'
+  s.version     = '1.0.1'
+  s.date        = '2013-08-14'
+  s.summary     = "Boolean normalizing property for Puppet types."
+  s.description = s.summary
+  s.authors     = ["Vox Pupuli"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/voxpupuli/puppet-boolean'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-dnsmasq/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-dnsmasq/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-dnsmasq.gemspec	2019-10-31 12:10:38.277914711 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-dnsmasq'
+  s.version     = '1.1.0'
+  s.date        = '2014-03-15'
+  s.summary     = "Puppet module for dnsmasq"
+  s.description = s.summary
+  s.authors     = ["Javier Bertoli"]
+  s.email       = ''
+  s.files       = %w(Modulefile README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'http://www.netmanagers.com.ar'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-dnsmasq/metadata.json.patch
+++ b/recipes-support/puppet/files/puppet-dnsmasq/metadata.json.patch
@ -0,0 +1,17 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 12:11:57.326213149 -0700
+@@ -0,0 +1,14 @@
+{
+  "name": "puppet-dnsmasq",
+  "version": "1.1.0",
+  "author": "Javier Bertoli",
+  "summary": "Puppet module for dnsmasq.",
+  "license": "Apache-2.0",
+  "source": "https://github.com/netmanagers/puppet-dnsmasq",
+  "project_page": "http://www.netmanagers.com.ar",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+  	{"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0 < 5.0.0"},
+	{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 < 5.0.0"}
+  ]
+}
--- a/recipes-support/puppet/files/puppet-filemapper/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-filemapper/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/adrien-filemapper.gemspec	2019-10-31 11:12:27.233178439 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'adrien-filemapper'
+  s.version     = '1.1.3'
+  s.date        = '2014-09-13'
+  s.summary     = "Puppet provider file manipulation extension"
+  s.description = s.summary
+  s.authors     = ["Adrien Thebo <adrien@somethingsinistral.net>"]
+  s.email       = ''
+  s.files       = %w(Modulefile README.markdown ) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/adrienthebo/puppet-filemapper'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-filemapper/metadata.json.patch
+++ b/recipes-support/puppet/files/puppet-filemapper/metadata.json.patch
@ -0,0 +1,14 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 13:24:24.780569778 -0700
+@@ -0,0 +1,11 @@
+{
+  "name": "adrien-filemapper",
+  "version": "1.1.3",
+  "author": "Adrien Tehbo <adrien@somethingsinistral.net>",
+  "summary": "Puppet provider file manipulation extension",
+  "license": "Apache-2.0",
+  "source": "https://github.com/adrienthebo/puppet-filemapper",
+  "project_page": "https://github.com/adrienthebo/puppet-filemapper",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [ ]
+}
--- a/recipes-support/puppet/files/puppet-kmod/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-kmod/Add-gemspec.patch
@ -1,10 +1,10 @@
--- /dev/null	2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-kmod.gemspec	2019-10-28 09:48:16.811566393 -0700
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/camptocamp-kmod.gemspec	2019-10-31 13:36:53.819223247 -0700
@@ -0,0 +1,12 @@
 +Gem::Specification.new do |s|
-+  s.name        = 'puppet-kmod'
-+  s.version     = '2.1.1'
-+  s.date        = '2016-08-21'
+  s.name        = 'camptocamp-kmod'
+  s.version     = '2.1.0'
+  s.date        = '2016-06-24'
 +  s.summary     = "Manage Linux kernel modules with Puppet"
 +  s.description = s.summary
 +  s.authors     = ["camptocamp"]
--- a/recipes-support/puppet/files/puppet-ldap/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-ldap/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-ldap.gemspec	2019-10-30 21:04:14.309536996 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-ldap'
+  s.version     = '0.2.4'
+  s.date        = '2014-09-13'
+  s.summary     = "OpenLDAP module for Puppet."
+  s.description = s.summary
+  s.authors     = ["Emiliano Castagnari ecastag@gmail.com (aka Torian)"]
+  s.email       = ''
+  s.files       = %w(Modulefile README.md) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/torian/puppet-ldap'
+  s.license     = 'GPL-2.0'
+ end
--- a/recipes-support/puppet/files/puppet-nslcd/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-nslcd/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-nslcd.gemspec	2019-10-30 21:26:00.013491029 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-nslcd'
+  s.version     = '0.0.1'
+  s.date        = '2015-01-26'
+  s.summary     = "Manages the nslcd daemon"
+  s.description = s.summary
+  s.authors     = ["Johan Lyheden"]
+  s.email       = ''
+  s.files       = %w(Modulefile README.markdown ) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/adrienthebo/puppet-filemapper'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-nslcd/metadata.json.patch
+++ b/recipes-support/puppet/files/puppet-nslcd/metadata.json.patch
@ -0,0 +1,16 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 14:52:09.693312689 -0700
+@@ -0,0 +1,13 @@
+{
+  "name": "jlyheden-nslcd",
+  "version": "0.0.1",
+  "author": "John Lyheden",
+  "summary": "Manages the nslcd daemon.",
+  "license": "Apache-2.0",
+  "source": "git://github.com/jlyheden/puppet-nslcd",
+  "project_page": "https://github.com/jlyheden/puppet-nslcd",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+  	{"name":"puppetlabs/stdlib","version_requirement":">= 2.6.0 < 5.0.0"}
+  ]
+}
--- a/recipes-support/puppet/files/puppet-nssdb/metadata.json.patch
+++ b/recipes-support/puppet/files/puppet-nssdb/metadata.json.patch
@ -0,0 +1,16 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 15:37:09.270028865 -0700
+@@ -0,0 +1,13 @@
+{
+  "name": "rcritten/nssdb",
+  "version": "1.0.1",
+  "author": "Rob Crittenden",
+  "summary": "NSS database Puppet Module.",
+  "license": "Apache-2.0",
+  "source": "https://github.com/netmanagers/puppet-dnsmasq",
+  "project_page": "https://github.com/rcritten/puppet-nssdb",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+  	{"name":"puppetlabs/stdlib","version_requirement":">= 0.0.1"}
+  ]
+}
--- a/recipes-support/puppet/files/puppet-puppi/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-puppi/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppet-puppi.gemspec	2019-10-30 21:37:32.685810531 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppet-puppi'
+  s.version     = '2.2.3'
+  s.date        = '2017-03-10'
+  s.summary     = "Installs and configures Puppi"
+  s.description = s.summary
+  s.authors     = ["Alessandro Franceschi"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/example42/puppi'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppet-staging/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-staging/Add-gemspec.patch
@ -1,15 +1,15 @@
--- /dev/null	2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-staging.gemspec	2019-10-28 08:57:41.431851091 -0700
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/nanliu-staging.gemspec	2019-10-31 09:06:27.338571776 -0700
@@ -0,0 +1,12 @@
 +Gem::Specification.new do |s|
-+  s.name        = 'puppet-staging'
+  s.name        = 'nanliu-staging'
 +  s.version     = '1.0.4'
 +  s.date        = '2015-01-29'
-+  s.summary     = "Puppet staging module"
+  s.summary     = "Compressed file staging and deployment"
 +  s.description = s.summary
-+  s.authors     = ["Puppet nanliu"]
+  s.authors     = ["Nan Liu"]
 +  s.email       = ''
 +  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
 +  s.homepage    = 'https://github.com/nanliu/puppet-staging'
-+  s.license     = 'Apache 2.0'
+  s.license     = 'Apache-2.0'
 + end
--- a/recipes-support/puppet/files/puppet-sysctl/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppet-sysctl/Add-gemspec.patch
@ -1,11 +1,11 @@
--- /dev/null	2019-10-23 20:19:32.602763995 -0700
-+++ b/puppet-sysctl.gemspec	2019-10-28 08:28:00.166317104 -0700
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/duritong-sysctl.gemspec	2019-10-31 10:26:28.088576478 -0700
@@ -0,0 +1,12 @@
 +Gem::Specification.new do |s|
-+  s.name        = 'puppet-sysctl'
+  s.name        = 'duritong-sysctl'
 +  s.version     = '0.0.11'
 +  s.date        = '2015-06-05'
-+  s.summary     = "Puppet sysctl module"
+  s.summary     = "This modules allows you to configure sysctl."
 +  s.description = s.summary
 +  s.authors     = ["duritong"]
 +  s.email       = ''
--- a/recipes-support/puppet/files/puppet-vlan/metadata.json.patch
+++ b/recipes-support/puppet/files/puppet-vlan/metadata.json.patch
@ -0,0 +1,14 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 17:19:57.284059054 -0700
+@@ -0,0 +1,11 @@
+{
+  "name": "puppet-vlan",
+  "version": "0.1.0",
+  "author": "derekhiggins",
+  "summary": "very simple puppet module to install a vlan",
+  "license": "Apache-2.0",
+  "source": "https://github.com/derekhiggins/puppet-vlan.git",
+  "project_page": "https://github.com/derekhiggins/puppet-vlan.git",
+  "issues_url": "https://github.com/derekhiggins/puppet-vlan.git",
+  "dependencies": [ ]
+}
--- a/recipes-support/puppet/files/puppetlabs-concat/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppetlabs-concat/Add-gemspec.patch
@ -1,5 +1,5 @@
--- /dev/null	2019-10-23 20:19:32.602763995 -0700
-+++ b/puppetlabs-concat.gemspec	2019-10-28 14:05:25.733528380 -0700
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-concat.gemspec	2019-10-29 12:44:01.905771063 -0700
@@ -0,0 +1,12 @@
 +Gem::Specification.new do |s|
 +  s.name        = 'puppetlabs-concat'
@ -9,7 +9,7 @@
 +  s.description = s.summary
 +  s.authors     = ["Puppet Labs"]
 +  s.email       = ''
-+  s.files       = %w(LICENSE) + Dir.glob('{lib,spec}/**/*')
-+  s.homepage    = 'https://github.com/derekhiggins/puppet-vlan.git'
+  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-concat'
 +  s.license     = 'Apache 2.0'
 + end
--- a/recipes-support/puppet/files/puppetlabs-create-resources/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppetlabs-create-resources/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-create-resources.gemspec	2019-10-30 09:22:32.165637534 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppetlabs-create-resources'
+  s.version     = '0.0.1'
+  s.date        = '2013-09-30'
+  s.summary     = "Function to dynamically create resources from hashes."
+  s.description = s.summary
+  s.authors     = ["puppetlabs"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-create_resources'
+  s.license     = 'Apache 2.0'
+ end
--- a/recipes-support/puppet/files/puppetlabs-create-resources/metadata.json.patch
+++ b/recipes-support/puppet/files/puppetlabs-create-resources/metadata.json.patch
@ -0,0 +1,14 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/metadata.json	2019-10-31 12:18:48.281729608 -0700
+@@ -0,0 +1,11 @@
+{
+  "name": "puppetlabs-create_resources",
+  "version": "0.0.1",
+  "author": "Puppet Labs",
+  "summary": "Function to dynamically create resources from hashes.",
+  "license": "Apache-2.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-create_resources.git",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-create_resources",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [ ]
+}
--- a/recipes-support/puppet/files/puppetlabs-mysql/0001-Fix-ruby-path.patch
+++ b/recipes-support/puppet/files/puppetlabs-mysql/0001-Fix-ruby-path.patch
@ -0,0 +1,33 @@
+From c92a9d11002184a67f8bedf542d84f527eea3107 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Tue, 29 Oct 2019 15:12:18 -0700
+Subject: [PATCH] Fix ruby path
+
+---
+ tasks/export.rb | 2 +-
+ tasks/sql.rb    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tasks/export.rb b/tasks/export.rb
+index efd9d81..18106ec 100755
+--- a/tasks/export.rb
+++ b/tasks/export.rb
+@@ -1,4 +1,4 @@
+-#!/opt/puppetlabs/puppet/bin/ruby
+#!/usr/bin/ruby
+ require 'json'
+ require 'open3'
+ require 'puppet'
+diff --git a/tasks/sql.rb b/tasks/sql.rb
+index 29b2c6b..7256f2d 100755
+--- a/tasks/sql.rb
+++ b/tasks/sql.rb
+@@ -1,4 +1,4 @@
+-#!/opt/puppetlabs/puppet/bin/ruby
+#!/usr/bin/ruby
+ require 'json'
+ require 'open3'
+ require 'puppet'
+-- 
+2.17.1
+
--- a/recipes-support/puppet/files/puppetlabs-mysql/0001-Stx-uses-nanliu-staging-module.patch
+++ b/recipes-support/puppet/files/puppetlabs-mysql/0001-Stx-uses-nanliu-staging-module.patch
@ -0,0 +1,26 @@
+From 3b1cb5e63416223336d2bd6a43f66007b9d388e3 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Thu, 31 Oct 2019 13:54:47 -0700
+Subject: [PATCH] Stx uses nanliu-staging module
+
+Use nanliu-staging instead of puppet-staging
+---
+ metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index 94e9d69..682c1e1 100644
+--- a/metadata.json
+++ b/metadata.json
+@@ -9,7 +9,7 @@
+   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+   "dependencies": [
+     {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"},
+-    {"name":"puppet/staging","version_requirement":">= 1.0.1 < 3.0.0"}
+    {"name":"nanliu/staging","version_requirement":">= 1.0.1 < 3.0.0"}
+   ],
+   "operatingsystem_support": [
+     {
+-- 
+2.17.1
+
--- a/recipes-support/puppet/files/puppetlabs-mysql/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppetlabs-mysql/Add-gemspec.patch
@ -1,11 +1,11 @@
--- /dev/null	2019-10-23 20:19:32.602763995 -0700
-+++ b/puppetlabs-mysql.gemspec	2019-10-24 18:37:03.348286718 -0700
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-mysql.gemspec	2019-10-31 11:20:18.066704740 -0700
@@ -0,0 +1,12 @@
 +Gem::Specification.new do |s|
 +  s.name        = 'puppetlabs-mysql'
-+  s.version     = '10.2.0'
+  s.version     = '3.11.0'
 +  s.date        = '2019-09-24'
-+  s.summary     = "Puppet Labs myql module"
+  s.summary     = "Installs, configures, and manages the MySQL service."
 +  s.description = s.summary
 +  s.authors     = ["Puppet Labs"]
 +  s.email       = ''
--- a/recipes-support/puppet/files/puppetlabs-rabbitmq/0006-Set-rabbitmq-dependency-to-nanliu-staging.patch
+++ b/recipes-support/puppet/files/puppetlabs-rabbitmq/0006-Set-rabbitmq-dependency-to-nanliu-staging.patch
@ -0,0 +1,27 @@
+From 346abfb3a98c0b527bb8e73ff1978dbd32684c17 Mon Sep 17 00:00:00 2001
+From: babak sarashki <babak.sarashki@windriver.com>
+Date: Thu, 31 Oct 2019 10:16:21 -0700
+Subject: [PATCH] Set rabbitmq dependency to nanliu/staging
+
+Stx package puppet-staging-1.0.4-1.b466d93git sets module name to:
+nanliu-staging.
+This patch sets rabbitmq dependency accordingly.
+---
+ metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index b3426f6..c4297b2 100644
+--- a/metadata.json
+++ b/metadata.json
+@@ -48,6 +48,6 @@
+   ],
+   "dependencies": [
+     {"name":"puppetlabs/stdlib","version_requirement":">= 3.13.1 < 5.0.0"},
+-    {"name":"puppet/staging","version_requirement":">= 0.3.1 < 2.0.0"}
+    {"name":"nanliu/staging","version_requirement":">= 0.3.1 < 2.0.0"}
+   ]
+ }
+-- 
+2.17.1
+
--- a/recipes-support/puppet/files/puppetlabs-rabbitmq/b/puppetlabs-rabbitmq.gemspec
+++ b/recipes-support/puppet/files/puppetlabs-rabbitmq/b/puppetlabs-rabbitmq.gemspec
@ -1,12 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = 'puppetlabs-rabbitmq'
-  s.version     = '5.6.0'
-  s.date        = '2017-01-09'
-  s.summary     = "Installs, configures, and manages RabbitMQ."
-  s.description = s.summary
-  s.authors     = ["Puppet Labs"]
-  s.email       = ''
-  s.files       = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-rabbitmq'
-  s.license     = 'Apache 2.0'
- end
--- a/recipes-support/puppet/files/puppetlabs-stdlib/Add-gemspec.patch
+++ b/recipes-support/puppet/files/puppetlabs-stdlib/Add-gemspec.patch
@ -0,0 +1,15 @@
+--- /dev/null	2019-10-28 19:50:04.372284581 -0700
+++ b/puppetlabs-stdlib.gemspec	2019-10-29 15:09:32.804637910 -0700
+@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name        = 'puppetlabs-stdlib'
+  s.version     = '4.13.1'
+  s.date        = '2016-10-12'
+  s.summary     = "Puppet Labs Standard Library module"
+  s.description = s.summary
+  s.authors     = ["Puppet Labs"]
+  s.email       = ''
+  s.files       = %w(LICENSE README.markdown Rakefile) + Dir.glob('{lib,spec}/**/*')
+  s.homepage    = 'https://github.com/puppetlabs/puppetlabs-stdlib'
+  s.license     = 'Apache 2.0'
+end
--- a/recipes-support/puppet/puppet-barbican_git.bb
+++ b/recipes-support/puppet/puppet-barbican_git.bb
@ -3,6 +3,10 @@ SUMMARY = "Puppet module for OpenStack Barbican"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fce88ac1cd1315adf28a52502c9f7f6b"

+RDEPENDS_${PN} += " \
+	puppetlabs-inifile \
+	"
+
 PV = "11.3.0"
 SRC_REV = "8241a1d13be6c3ee6344fa46dcfc045439044e76"
 PROTOCOL = "https"
@ -29,5 +33,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-barbican-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/barbican
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/barbican
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-boolean_git.bb
+++ b/recipes-support/puppet/puppet-boolean_git.bb
@ -3,32 +3,34 @@ DESCRIPTION = "Logical Resource Management (LVM) features for Puppet."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8cbd44f4ffbc81632df22fdd4ae87811"

+PV = "1.0.1"
 SRCREV = "22b726dd78b0a60a224cc7054aebbf28e9306f62"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/adrienthebo/puppet-boolean;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
+	"
+inherit ruby
+
+DEPENDS += " \
+	ruby \
+	facter \
 	"

-do_configure() {
-	:
-}
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"

-do_compile() {
-	cd ${S}
-	find . -type f -name ".*" -exec rm {} +
-	find . -size 0 -exec rm {} +
-	find . \( -name "*.pl" -o -name "*.sh"  \) -exec chmod +x {} +
-	find . \( -name "*.pp" -o -name "*.py"  \) -exec chmod -x {} +
-	find . \( -name "*.rb" -o -name "*.erb" \) -exec chmod -x {} +
-	find . \( -name spec -o -name ext \) | xargs rm -rf
-}
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"

-do_install() {
-	cd ${S}
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/boolean
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/boolean/
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-ceph_git.bb
+++ b/recipes-support/puppet/puppet-ceph_git.bb
@ -39,5 +39,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-ceph-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/ceph
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/ceph
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-certmonger_git.bb
+++ b/recipes-support/puppet/puppet-certmonger_git.bb
@ -32,5 +32,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-certmonger-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/certmonger
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/certmonger
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-collectd_git.bb
+++ b/recipes-support/puppet/puppet-collectd_git.bb
@ -10,7 +10,7 @@ BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/voxpupuli/puppet-collectd;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
-	file://puppet-collectd/Add-gemspec.patch \
+	file://${PN}/Add-gemspec.patch \
 	"

 inherit ruby
@ -26,8 +26,12 @@ RDEPENDS_${PN} += " \
 	puppet \
 	"

-RUBY_INSTALL_GEMS = "puppet-collectd-${PV}.gem"
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/collectd
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/collectd
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-create-resources_git.bb
+++ b/recipes-support/puppet/puppet-create-resources_git.bb
@ -1,32 +0,0 @@
-DESCRIPTION = "puppet-boolean"
-
-STABLE = "master"
-PROTOCOL = "https"
-BRANCH = "master"
-SRCREV = "4639819a7f3a4fa9310d2ba583c63e467df7e2c3"
-S = "${WORKDIR}/git"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
-
-SRC_URI = "git://github.com/puppetlabs/puppetlabs-create_resources.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-do_configure () {
-	:
-} 
-
-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/
-	install -d -m 0755 ${D}/${datadir}/puppet/modules/create-resources
-	cp -R * ${D}/${datadir}/puppet/modules/create-resources
-	# chown -R root:root ${D}/
-}
-
-FILES_${PN}_append += " \
-	${datadir}/puppet/modules/create-resources \
-	"
--- a/recipes-support/puppet/puppet-dnsmasq.bb
+++ b/recipes-support/puppet/puppet-dnsmasq.bb
@ -1,36 +1,37 @@
 DESCRIPTION = "puppet module for dnsmasq"

+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://README.md;md5=71e3bfa9ffc5e93324727bbffae917f5"
+
+PV = "1.1.0"
 STABLE = "master"
 PROTOCOL = "https"
 BRANCH = "master"
-# SRCREV = "cff07e90890662972c97684a2baee964f68ff3ed"
-SRCREV = "89759de7d7bb45fb4527ff0aa5f75f258fd0cae9"
+SRCREV = "cff07e90890662972c97684a2baee964f68ff3ed"
 S = "${WORKDIR}/git"

-LICENSE = "Apache-2.0"
+SRC_URI = "git://github.com/netmanagers/puppet-dnsmasq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
+	"
+inherit ruby

-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+DEPENDS += " \
+	ruby \
+	facter \
+	"

-SRC_URI = "git://github.com/netmanagers/puppet-dnsmasq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
-
-RDEPENDS_${PN}_append = " \
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
 	puppet \
 	"

-do_configure () {
-	:
-} 
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"

-do_compile() {
-	:
-}
-
-do_install () {
-	cd ${S}/
+do_install_append () {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/dnsmasq
 	cp -R * ${D}/${datadir}/puppet/modules/dnsmasq/
 }

-FILES_${PN}_append += " \
-	${datadir}/puppet/modules/dnsmasq/ \
-	"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-drbd_git.bb
+++ b/recipes-support/puppet/puppet-drbd_git.bb
@ -1,16 +1,18 @@
 DESCRIPTION = "puppet-drbd"

-STABLE = "master"
+PV = "0.3.1"
+SRCREV = "496b3ba9cd74a2d12636f9e90a718739a5451169"
 PROTOCOL = "https"
 BRANCH = "master"
-SRCREV = "496b3ba9cd74a2d12636f9e90a718739a5451169"
 S = "${WORKDIR}/git"

 LICENSE = "Apache-2.0"

 LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "

-SRC_URI = "git://github.com/puppetlabs/puppetlabs-drbd.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+SRC_URI = " \
+	git://github.com/voxpupuli/puppet-drbd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://drbd/Add-gemspec.patch \
 	file://drbd/0001-TIS-Patches.patch \
 	file://drbd/0002-Disable-timeout-for-mkfs-command.patch \
 	file://drbd/0003-drbd-parallel-to-serial-synchronization.patch \
@ -21,28 +23,24 @@ SRC_URI = "git://github.com/puppetlabs/puppetlabs-drbd.git;protocol=${PROTOCOL};
 	file://drbd/0008-CGTS-7953-support-for-new-drbd-resources.patch \
 	file://drbd/0009-drbd-slow-before-swact.patch \
 	"
+inherit ruby 

 DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
 	puppet \
 	"

-do_configure() {
-	:
-}
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"

-do_compile() {
-	find . -type f -name ".*" -exec rm {} +
-	find . -size 0 -exec rm {} +
-	find . \( -name "*.pl" -o -name "*.sh"  \) -exec chmod +x {} +
-	find . \( -name "*.pp" -o -name "*.py"  \) -exec chmod -x {} +
-	find . \( -name "*.rb" -o -name "*.erb" \) -exec chmod -x {} +
-	find . \( -name spec -o -name ext \) | xargs rm -rf
-}
-
-do_install() {
-	cd ${S}
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/drbd
 	cp -r ${S}/* ${D}/${datadir}/puppet/modules/drbd
 }

-FILES_${PN} = "${datadir}"
+FILES_${PN} += "${datadir}"
--- a/recipes-support/puppet/puppet-etcd_git.bb
+++ b/recipes-support/puppet/puppet-etcd_git.bb
@ -29,5 +29,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-etcd-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/etcd
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/etcd
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-filemapper_git.bb
+++ b/recipes-support/puppet/puppet-filemapper_git.bb
@ -3,26 +3,37 @@ DESCRIPTION = "A Puppet module to map files to resources and back."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b43880e14353cbc12cf3981fb93a0944"

+PV = "1.1.3"
 SRCREV = "9b53310278e76827bbe12a36cc6470d77071abb2"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = " \
-	git://github.com/voxpupuli/puppet-filemapper;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	git://github.com/adrienthebo/puppet-filemapper;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
 	" 
-do_configure() {
-	:
-}

-do_compile() {
-	:
-}
+inherit ruby 

-do_install() {
-	cd ${S}
+DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_BUILD_GEMS = "adrien-filemapper.gemspec"
+RUBY_INSTALL_GEMS = "adrien-filemapper-${PV}.gem"
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/filemapper
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/filemapper
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-horizon_git.bb
+++ b/recipes-support/puppet/puppet-horizon_git.bb
@ -35,4 +35,9 @@ RDEPENDS_${PN} += " \

 RUBY_INSTALL_GEMS = "puppet-horizon-${PV}.gem"

-# do_install_append() { : }
+do_install_append() { 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/horizon
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/horizon
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-keystone_git.bb
+++ b/recipes-support/puppet/puppet-keystone_git.bb
@ -34,5 +34,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-keystone-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/keystone
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/keystone
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-kmod_git.bb
+++ b/recipes-support/puppet/puppet-kmod_git.bb
@ -3,8 +3,8 @@ SUMMARY = "Manage Linux kernel modules with Puppet"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5ccf641e613489e66aa98271dbe798"

-PV = "2.1.1"
-SRC_REV = "ea03df0eff7b7e5faccb9c4e386d451301468f04"
+PV = "2.1.0"
+SRC_REV = "0d69a96e8d0d3a08da0d5f476c733134df4fb9ee"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"
@ -26,8 +26,12 @@ RDEPENDS_${PN} += " \
 	puppet \
 	"

-RUBY_INSTALL_GEMS = "puppet-kmod-${PV}.gem"
+RUBY_BUILD_GEMS = "camptocamp-kmod.gemspec"
+RUBY_INSTALL_GEMS = "camptocamp-kmod-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/kmod
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/kmod
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-ldap_git.bb
+++ b/recipes-support/puppet/puppet-ldap_git.bb
@ -1,27 +1,36 @@
-DESCRIPTION = "A Puppet module to manage client and server configuration for OpenLdap."
+SUMMARY = "OpenLDAP module for Puppet."

 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://metadata.json;md5=4244fe391bee02e9ee7259aa7f8dda8b"

+PV = "0.2.4"
 SRCREV = "480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

-SRC_URI = "git://github.com/torian/puppet-ldap;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
+SRC_URI = " \
+	git://github.com/torian/puppet-ldap;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://puppet-ldap/Add-gemspec.patch \
+	"
+inherit ruby 

-do_configure() {
-	:
-}
+DEPENDS += " \
+	ruby \
+	facter \
+	"

-do_compile() {
-	:
-}
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"

-do_install() {
-	cd ${S}
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/ldap
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/ldap
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-memcached_git.bb
+++ b/recipes-support/puppet/puppet-memcached_git.bb
@ -36,5 +36,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-memcached-${PV}.gem"

 do_install_append() { 
-	:
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/memcached
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/memcached
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-network_git.bb
+++ b/recipes-support/puppet/puppet-network_git.bb
@ -1,8 +1,10 @@
-DESCRIPTION = "A Puppet module to manage non volatile network and route configuration."
+SUMMARY = "A Puppet module to manage non volatile network and route configuration."

 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b43880e14353cbc12cf3981fb93a0944"

+
+PV = "0.5.0"
 SRCREV = "7deacd5fdc22c0543455878a8d1872f2f5417c1d"
 PROTOCOL = "https"
 BRANCH = "master"
@ -10,6 +12,8 @@ S = "${WORKDIR}/git"

 SRC_URI = " \
 	git://github.com/voxpupuli/puppet-network;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://network/Add-gemspec.patch \
+	file://network/metadata.json.patch \
 	file://network/puppet-network-Kilo-quilt-changes.patch;striplevel=5 \
 	file://network/puppet-network-support-ipv6.patch;striplevel=5 \
 	file://network/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch;striplevel=5 \
@ -17,19 +21,34 @@ SRC_URI = " \
 	file://network/permit-inservice-update-of-static-routes.patch;striplevel=5 \
 	file://network/ipv6-static-route-support.patch;striplevel=5 \
 	file://network/route-options-support.patch;striplevel=5 \
+	file://network/0001-Stx-uses-puppet-boolean-instead-of-adrien-boolean.patch \
 	" 
-do_configure() {
-	:
-}

-do_compile() {
-	:
-}
+inherit ruby 

-do_install() {
-	cd ${S}
+DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/network
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/network
+	# Remove broken symlinks for now
+	rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/manifests
+	rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/templates
+	rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/files
+	rm -f ${D}/${libdir}/ruby/gems/2.5.0/gems/puppet-network-0.5.0/spec/fixtures/modules/network/lib
+	rm -f ${D}/${datadir}/puppet/modules/network/spec/fixtures/modules/network/files
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-nslcd_git.bb
+++ b/recipes-support/puppet/puppet-nslcd_git.bb
@ -1,8 +1,9 @@
-DESCRIPTION = "A Puppet module for nslcd - local LDAP name service daemon."
+SUMMARY = "A Puppet module to manage the nslcd daemon which provides authentication via LDAP"

 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://Modulefile;md5=674f57ad12dfafcf6c3943f34d459ded"

+PV = "0.0.1"
 SRCREV = "b8c19b1ada89865f2e50758e054583798ad8011a"
 PROTOCOL = "https"
 BRANCH = "master"
@ -10,19 +11,28 @@ S = "${WORKDIR}/git"

 SRC_URI = " \
 	git://github.com/jlyheden/puppet-nslcd;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
 	" 
-do_configure() {
-	:
-}

-do_compile() {
-	:
-}
+inherit ruby 

-do_install() {
-	cd ${S}
+DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/nslcd
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/nslcd
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-nssdb_git.bb
+++ b/recipes-support/puppet/puppet-nssdb_git.bb
@ -10,7 +10,8 @@ BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/rcritten/puppet-nssdb.git;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
-	file://puppet-nssdb/Add-gemspec.patch \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
 	"

 inherit ruby
@ -29,5 +30,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-nssdb-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/nssdb
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/nssdb
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-openstacklib_git.bb
+++ b/recipes-support/puppet/puppet-openstacklib_git.bb
@ -30,5 +30,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-openstacklib-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/openstacklib
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/openstacklib
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-oslo_git.bb
+++ b/recipes-support/puppet/puppet-oslo_git.bb
@ -31,5 +31,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppet-oslo-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/oslo
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/oslo
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-puppi_git.bb
+++ b/recipes-support/puppet/puppet-puppi_git.bb
@ -1,8 +1,13 @@
-DESCRIPTION = "A Puppet module to manage non volatile network and route configuration."
+SUMMARY = "Installs and configures Puppi."
+DESCRIPTION = " \
+	This module provides the Puppi libraries required by Example42 modules and, if explicitely included, the \
+	puppi command, its working environment, the defines and procedures to deploy applications.\
+	"

 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a300b604c66de62cf6e923cca89c9d83"

+PV = "2.2.3"
 SRCREV = "c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81"
 PROTOCOL = "https"
 BRANCH = "master"
@ -10,19 +15,27 @@ S = "${WORKDIR}/git"

 SRC_URI = " \
 	git://github.com/example42/puppi;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
 	" 
-do_configure() {
-	:
-}

-do_compile() {
-	:
-}
+inherit ruby 

-do_install() {
-	cd ${S}
+DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/puppi
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/puppi
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-staging_git.bb
+++ b/recipes-support/puppet/puppet-staging_git.bb
@ -9,7 +9,8 @@ PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

-SRC_URI = "git://github.com/nanliu/puppet-staging;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
+SRC_URI = " \
+	git://github.com/nanliu/puppet-staging;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
 	file://puppet-staging/Add-gemspec.patch \
 	"

@ -26,8 +27,12 @@ RDEPENDS_${PN} += " \
 	puppet \
 	"

-RUBY_INSTALL_GEMS = "puppet-staging-${PV}.gem"
+RUBY_BUILD_GEMS = "nanliu-staging.gemspec"
+RUBY_INSTALL_GEMS = "nanliu-staging-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/staging
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/staging
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-sysctl_git.bb
+++ b/recipes-support/puppet/puppet-sysctl_git.bb
@ -1,4 +1,4 @@
-SUMMARY = "This module manages the sysctl configuration (in /etc/sysctl.conf by default) and runtime values."
+SUMMARY = "This modules allows you to configure sysctl."

 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README.md;md5=b5335702ab6b120493cf88faaf9be346"
@ -10,7 +10,7 @@ BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/duritong/puppet-sysctl;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
-	file://puppet-sysctl/Add-gemspec.patch \
+	file://${PN}/Add-gemspec.patch \
 	"

 inherit ruby
@ -26,8 +26,12 @@ RDEPENDS_${PN} += " \
 	puppet \
 	"

-RUBY_INSTALL_GEMS = "puppet-sysctl-${PV}.gem"
+RUBY_BUILD_GEMS = "duritong-sysctl.gemspec"
+RUBY_INSTALL_GEMS = "duritong-sysctl-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/sysctl
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/sysctl
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-vlan_git.bb
+++ b/recipes-support/puppet/puppet-vlan_git.bb
@ -10,7 +10,8 @@ BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/derekhiggins/puppet-vlan.git;protocol=${PROTOCOL};rev=${SRC_REV};branch=${BRANCH} \
-	file://puppet-vlan/Add-gemspec.patch \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
 	"

 inherit ruby
@ -26,9 +27,11 @@ RDEPENDS_${PN} += " \
 	puppet \
 	"

-RUBY_INSTALL_GEMS = "puppet-vlan-${PV}.gem"
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/vlan
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/vlan
 }

+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppet-vswitch_%.bbappend
+++ b/recipes-support/puppet/puppet-vswitch_%.bbappend
@ -0,0 +1,6 @@
+do_install_append() {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/vswitch
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/vswitch
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-apache_git.bb
+++ b/recipes-support/puppet/puppetlabs-apache_git.bb
@ -29,5 +29,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppetlabs-apache-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/apache
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/apache
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-concat_git.bb
+++ b/recipes-support/puppet/puppetlabs-concat_git.bb
@ -3,11 +3,11 @@ DESCRIPTION = "Construct files from multiple fragments."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

-SRCREV = "803f95830ebe58485c03abdae46801c12ca89be3"
+PV = "2.2.0"
+SRCREV = "fdf4a84534ccb1b9ae8ffb654c7e160a31e294ee"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"
-PV = "2.2.0"

 SRC_URI = "git://github.com/puppetlabs/puppetlabs-concat.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
    file://puppetlabs-concat/Add-gemspec.patch \
@ -27,3 +27,10 @@ RDEPENDS_${PN} += " \
 	"

 RUBY_INSTALL_GEMS = "puppetlabs-concat-${PV}.gem"
+
+do_install_append() {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/concat
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/concat
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-create-resources_git.bb
+++ b/recipes-support/puppet/puppetlabs-create-resources_git.bb
@ -0,0 +1,39 @@
+SUMMARY = "Function to dynamically create resources from hashes."
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6089b6bd1f0d807edb8bdfd76da0b038 "
+
+PV = "0.0.1"
+STABLE = "master"
+PROTOCOL = "https"
+BRANCH = "master"
+SRCREV = "4639819a7f3a4fa9310d2ba583c63e467df7e2c3"
+S = "${WORKDIR}/git"
+
+
+SRC_URI = " \
+	git://github.com/puppetlabs/puppetlabs-create_resources.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://${PN}/Add-gemspec.patch \
+	file://${PN}/metadata.json.patch \
+	"
+inherit ruby
+
+DEPENDS += " \
+	ruby \
+	facter \
+	"
+
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+do_install_append () {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/create_resources
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/create_resources
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-firewall_git.bb
+++ b/recipes-support/puppet/puppetlabs-firewall_git.bb
@ -29,5 +29,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppetlabs-firewall-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/firewall
+	cp -R ${S}/* ${D}/${datadir}/puppet/modules/firewall
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-haproxy_git.bb
+++ b/recipes-support/puppet/puppetlabs-haproxy_git.bb
@ -32,3 +32,10 @@ RDEPENDS_${PN} += " \

 RUBY_INSTALL_GEMS = "puppetlabs-haproxy-${PV}.gem"

+do_install_append() {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/haproxy
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/haproxy
+}
+
+FILES_${PN} += " ${datadir}"
+
--- a/recipes-support/puppet/puppetlabs-inifile.bb
+++ b/recipes-support/puppet/puppetlabs-inifile.bb
@ -29,5 +29,8 @@ RDEPENDS_${PN} += " \
 RUBY_INSTALL_GEMS = "puppetlabs-inifile-${PV}.gem"

 do_install_append() {
-	: 
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/inifile
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/inifile
 }
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-lvm_git.bb
+++ b/recipes-support/puppet/puppetlabs-lvm_git.bb
@ -1,14 +1,16 @@
-DESCRIPTION = "Logical Resource Management (LVM) features for Puppet."
+SUMMARY = "Provides Puppet types and providers to manage Logical Resource Management (LVM) features."

 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"

+PV = "0.5.0"
 SRCREV = "d0283da637ae24550fb4ba109a48ef8d5d8c8b84"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/puppetlabs/puppetlabs-lvm;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://lvm/Add-gemspec.patch \
 	file://lvm/0001-puppet-lvm-kilo-quilt-changes.patch;striplevel=5 \
 	file://lvm/0002-UEFI-pvcreate-fix.patch;striplevel=5 \
 	file://lvm/0003-US94222-Persistent-Dev-Naming.patch;striplevel=5 \
@ -16,18 +18,25 @@ SRC_URI = "git://github.com/puppetlabs/puppetlabs-lvm;protocol=${PROTOCOL};rev=$
 	file://lvm/Fix-the-logical-statement-for-nuke_fs_on_resize.patch;striplevel=5 \
 	"

-do_configure() {
-	:
-}
+inherit ruby 

-do_compile() {
-	:
-}
+DEPENDS += " \
+	ruby \
+	facter \
+	"

-do_install() {
-	cd ${S}
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/lvm
 	cp -R ${S}/* ${D}/${datadir}/puppet/modules/lvm/
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-mysql_git.bb
+++ b/recipes-support/puppet/puppetlabs-mysql_git.bb
@ -3,14 +3,15 @@ SUMMARY = "The mysql module installs, configures, and manages the MySQL service.
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

-SRCREV = "817844c08573177f73be71049b521ec67c134951"
+PV = "3.11.0"
+SRCREV = "920dd76214d87d9b26f0db105886ee89ac266c4e"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"
-PV = "10.2.0"

 SRC_URI = "git://github.com/puppetlabs/puppetlabs-mysql.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
    file://puppetlabs-mysql/Add-gemspec.patch \
+    file://${PN}/0001-Stx-uses-nanliu-staging-module.patch \
    "

 inherit ruby
@ -27,3 +28,10 @@ RDEPENDS_${PN} += " \
 	"

 RUBY_INSTALL_GEMS = "puppetlabs-mysql-${PV}.gem"
+
+do_install_append() {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/mysql
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/mysql
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-postgresql_git.bb
+++ b/recipes-support/puppet/puppetlabs-postgresql_git.bb
@ -3,6 +3,7 @@ DESCRIPTION = "A Puppet module for managing PostgreSQL databases."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

+PV = "4.8.0"
 SRCREV = "d022a56b28b2174456fc0f6adc51a4b54493afad"
 PROTOCOL = "https"
 BRANCH = "master"
@ -10,27 +11,29 @@ S = "${WORKDIR}/git"

 SRC_URI = " \
 	git://github.com/puppetlabs/puppetlabs-postgresql;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+	file://postgresql/Add-gemspec.patch \
 	file://postgresql/0001-Roll-up-TIS-patches.patch \
 	file://postgresql/0002-remove-puppetlabs-apt-as-a-requirement.patch \
 	"

-do_configure() {
-	:
-}
+inherit ruby 

-do_compile() {
-	find . -type f -name ".*" -exec rm {} +
-	find . -size 0 -exec rm {} +
-	find . \( -name "*.pl" -o -name "*.sh"  \) -exec chmod +x {} +
-	find . \( -name "*.pp" -o -name "*.py"  \) -exec chmod -x {} +
-	find . \( -name "*.rb" -o -name "*.erb" \) -exec chmod -x {} +
-	find . \( -name spec -o -name ext \) | xargs rm -rf
-}
+DEPENDS += " \
+	ruby \
+	facter \
+	"

-do_install() {
-	cd ${S}
+RDEPENDS_${PN} += " \
+	ruby \
+	facter \
+	puppet \
+	"
+
+RUBY_INSTALL_GEMS = "${PN}-${PV}.gem"
+
+do_install_append() {
 	install -d -m 0755 ${D}/${datadir}/puppet/modules/postgresql
-	cp -rp ${S}/* ${D}/${datadir}/puppet/modules/postgresql
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/postgresql
 }

-FILES_${PN} = " ${datadir}"
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-rabbitmq_git.bb
+++ b/recipes-support/puppet/puppetlabs-rabbitmq_git.bb
@ -4,22 +4,20 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

 PV = "5.6.0"
-SRCREV = "057a0138f9a53a1d8b7a582734968ec194c3c705"
+SRCREV = "5ac45dedd9b409c9efac654724bc74867cb9233b"
 PROTOCOL = "https"
 BRANCH = "master"
 S = "${WORKDIR}/git"

 SRC_URI = "git://github.com/puppetlabs/puppetlabs-rabbitmq;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
 	file://puppetlabs-rabbitmq/Add-gemspec.patch \
+	file://puppetlabs-rabbitmq/0001-Roll-up-TIS-patches.patch \
+	file://puppetlabs-rabbitmq/0002-Changed-cipher-specification-to-openssl-format.patch \
+	file://puppetlabs-rabbitmq/0003-Eliminate-Puppet-4-deprecation-warnings.patch \
+	file://puppetlabs-rabbitmq/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch \
+	file://puppetlabs-rabbitmq/0005-Remove-the-rabbitmq_nodename-fact.patch \
+	file://puppetlabs-rabbitmq/0006-Set-rabbitmq-dependency-to-nanliu-staging.patch \
 	"
-# FIXME: These patches dont apply cleanly. This means that we may not be using the 
-# same version as in stx.
-#	file://puppetlabs-rabbitmq/0001-Roll-up-TIS-patches.patch \
-#	file://puppetlabs-rabbitmq/0002-Changed-cipher-specification-to-openssl-format.patch \
-#	file://puppetlabs-rabbitmq/0003-Eliminate-Puppet-4-deprecation-warnings.patch \
-#	file://puppetlabs-rabbitmq/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch \
-#	file://puppetlabs-rabbitmq/0005-Remove-the-rabbitmq_nodename-fact.patch \
-#	"

 inherit ruby

@ -36,3 +34,9 @@ RDEPENDS_${PN} += " \

 RUBY_INSTALL_GEMS = "puppetlabs-rabbitmq-${PV}.gem"

+do_install_append() {
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/rabbitmq
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/rabbitmq
+}
+
+FILES_${PN} += " ${datadir}"
--- a/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
+++ b/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
@ -1,12 +1,24 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCREV = "f2492ee916c1c8e0345514045432c4a049674029"
+PROTOCOL = "https"
+BRANCH = "master"
+S = "${WORKDIR}/git"
+PV = "4.13.1"
+
+SRC_URI = " \
+    git://github.com/puppetlabs/puppetlabs-stdlib.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
+        file://puppetlabs-stdlib/Add-gemspec.patch \
+	"
 # FIXME: 
 # For now this is a Workaround to not install broken links; otherwise the package strip and split fails.

 do_install_append () {
-	rm -rf ${D}/usr/lib/ruby/gems/2.5.0/gems/puppetlabs-stdlib-4.10.0/spec/fixtures/modules/stdlib/manifests
-	rm -rf ${D}/usr/lib/ruby/gems/2.5.0/gems/puppetlabs-stdlib-4.10.0/spec/fixtures/modules/stdlib/lib
-	cp -r ${S}/manifests \
-		${D}/usr/lib/ruby/gems/2.5.0/gems/puppetlabs-stdlib-4.10.0/spec/fixtures/modules/stdlib/
-	cp -r ${S}/lib \
-		${D}/usr/lib/ruby/gems/2.5.0/gems/puppetlabs-stdlib-4.10.0/spec/fixtures/modules/stdlib/
+	install -d -m 0755 ${D}/${datadir}/puppet/modules/stdlib
+	cp -r ${S}/* ${D}/${datadir}/puppet/modules/stdlib
 }
+
+FILES_${PN} += " ${datadir}"