diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-27 13:25:35 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-27 13:25:35 -0700 |
| commit | 1b12b55b6a2d3581f9643bf09d55727ba1213580 (patch) | |
| tree | 9b264a5c82bea7fae868467166e1c647b72d5a53 /lib/puppet/rails | |
| parent | ced9f553772d6fb786e620fada1c23427bd269bf (diff) | |
| parent | 361d6a3a6917fd9515a2180590fb671024132da7 (diff) | |
| download | puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.tar.gz puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.tar.xz puppet-1b12b55b6a2d3581f9643bf09d55727ba1213580.zip | |
Merge branch '2.6.next' into 2.7.next
* 2.6.next:
(#3420) Nagios "name" attribute does not output correctly
(#4487) When setting environment on a host, ensure it is a string.
add test for ticket 7101
(#6487) Add some testing for OS X version support in DirectoryService provider
(#6487) Directoryservice provider will fail in future OS releases
Diffstat (limited to 'lib/puppet/rails')
| -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. |