diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 14:08:14 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-26 14:08:14 -0200 |
| commit | fc08d8d4e96fb638e3ac8c2a50c973322c278d84 (patch) | |
| tree | 11e187c89788959beabfc573117b04e4ab237f4f /files/patches/trusty | |
| parent | 89cc9aa997958d7c19e6453699ffdc48a118038b (diff) | |
| download | puppet-bootstrap-fc08d8d4e96fb638e3ac8c2a50c973322c278d84.tar.gz puppet-bootstrap-fc08d8d4e96fb638e3ac8c2a50c973322c278d84.tar.bz2 | |
Deploy: apply patches before deployment
Diffstat (limited to 'files/patches/trusty')
| -rw-r--r-- | files/patches/trusty/puppet-stack-level.md | 3 | ||||
| -rw-r--r-- | files/patches/trusty/puppet-stack-level.patch | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/files/patches/trusty/puppet-stack-level.md b/files/patches/trusty/puppet-stack-level.md new file mode 100644 index 0000000..9a3f4d7 --- /dev/null +++ b/files/patches/trusty/puppet-stack-level.md @@ -0,0 +1,3 @@ +# Puppet stack level patch + +* [Puppet master fails with 'stack level too deep' error when storeconfigs = true](https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595). diff --git a/files/patches/trusty/puppet-stack-level.patch b/files/patches/trusty/puppet-stack-level.patch new file mode 100644 index 0000000..1d112f7 --- /dev/null +++ b/files/patches/trusty/puppet-stack-level.patch @@ -0,0 +1,15 @@ +--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ /usr/lib/ruby/vendor_ruby/puppet/rails/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. |