diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-20 13:53:25 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-20 13:53:25 -0200 |
| commit | 49c44668c835013a88e067e0af588d0005fe2d01 (patch) | |
| tree | ec8c044891f2b1cb807c8d7590e08685347b5597 /files | |
| parent | 91477be1db80bd38ccc03ab38487e69dcad30b86 (diff) | |
| download | puppet-bootstrap-49c44668c835013a88e067e0af588d0005fe2d01.tar.gz puppet-bootstrap-49c44668c835013a88e067e0af588d0005fe2d01.tar.bz2 | |
Patches, deployment code and TODO update
Diffstat (limited to 'files')
| -rw-r--r-- | files/patches/README.md | 4 | ||||
| -rw-r--r-- | files/patches/puppet-stack-level-trusty.patch | 15 |
2 files changed, 19 insertions, 0 deletions
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. |