diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-23 19:09:29 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-23 19:09:29 -0500 |
| commit | 0323986acd3a288e77c54b5fde20b280fa92b90a (patch) | |
| tree | 9b12a0bc61c2918beeafbd9fbe685304236c9d62 /lib/puppet/network | |
| parent | ff9705914570158d1bad3073728a2e94ca4a0060 (diff) | |
| parent | 939c952465815486da0d6c1a2207debb61a45618 (diff) | |
| download | puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.tar.gz puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.tar.xz puppet-0323986acd3a288e77c54b5fde20b280fa92b90a.zip | |
Merge commit 'turnbull/0.24.x' into 0.24.x
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 6d1a0235f..390f3d4e2 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -40,8 +40,10 @@ class Puppet::Network::Client::Master < Puppet::Network::Client facts["clientversion"] = Puppet.version.to_s # And add our environment as a fact. - facts["environment"] = Puppet[:environment] - + unless facts.include?("environment") + facts["environment"] = Puppet[:environment] + end + facts end |