From 49c44668c835013a88e067e0af588d0005fe2d01 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 20 Oct 2015 13:53:25 -0200 Subject: Patches, deployment code and TODO update --- files/patches/README.md | 4 ++++ files/patches/puppet-stack-level-trusty.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 files/patches/README.md create mode 100644 files/patches/puppet-stack-level-trusty.patch (limited to 'files') diff --git a/files/patches/README.md b/files/patches/README.md new file mode 100644 index 0000000..649bdf6 --- /dev/null +++ b/files/patches/README.md @@ -0,0 +1,4 @@ +Patches +======= + +* [Puppet master fails with 'stack level too deep' error when storeconfigs = true](https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595): puppet-stack-level-trusty.patch. diff --git a/files/patches/puppet-stack-level-trusty.patch b/files/patches/puppet-stack-level-trusty.patch new file mode 100644 index 0000000..3521dd9 --- /dev/null +++ b/files/patches/puppet-stack-level-trusty.patch @@ -0,0 +1,15 @@ +--- resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ resource.rb 2015-10-19 17:19:58.972194943 -0200 +@@ -84,7 +84,11 @@ + end + + def [](param) +- super || parameter(param) ++ if param == 'id' ++ super ++ else ++ super || parameter(param) ++ end + end + + # Make sure this resource is equivalent to the provided Parser resource. -- cgit v1.2.3