diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-04-26 14:16:17 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-04-26 14:16:17 -0700 |
| commit | ddc4e148689233058827f32832195daa935a99e2 (patch) | |
| tree | d2703076d0f97eb053030059e673dd957304451f /lib/puppet | |
| parent | 2cce3265885578910154854cf80ceb4d48ac631f (diff) | |
| parent | f656818bcd7cb88f24f6c578790771952120b1cc (diff) | |
| download | puppet-ddc4e148689233058827f32832195daa935a99e2.tar.gz puppet-ddc4e148689233058827f32832195daa935a99e2.tar.xz puppet-ddc4e148689233058827f32832195daa935a99e2.zip | |
Merge branch 'tickets/2.6.next/4487' into 2.6.next
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/rails/host.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb index b9dea2a3d..e5360217c 100644 --- a/lib/puppet/rails/host.rb +++ b/lib/puppet/rails/host.rb @@ -1,3 +1,4 @@ +require 'puppet/node/environment' require 'puppet/rails' require 'puppet/rails/resource' require 'puppet/rails/fact_name' @@ -28,6 +29,12 @@ class Puppet::Rails::Host < ActiveRecord::Base host end + # Override the setter for environment to force it to be a string, lest it + # be YAML encoded. See #4487. + def environment=(value) + super value.to_s + end + # returns a hash of fact_names.name => [ fact_values ] for this host. # Note that 'fact_values' is actually a list of the value instances, not # just actual values. |