diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-04-26 15:45:04 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-04-26 15:45:04 -0700 |
| commit | 361d6a3a6917fd9515a2180590fb671024132da7 (patch) | |
| tree | b4f5463c1936efa2882d2dabf426f0d1472b2f45 /lib/puppet | |
| parent | ddc4e148689233058827f32832195daa935a99e2 (diff) | |
| parent | 035240241d38e8872e4b67a6baaa43db4db64f96 (diff) | |
| download | puppet-361d6a3a6917fd9515a2180590fb671024132da7.tar.gz puppet-361d6a3a6917fd9515a2180590fb671024132da7.tar.xz puppet-361d6a3a6917fd9515a2180590fb671024132da7.zip | |
Merge branch 'tickets/2.6.next/3420' into 2.6.next
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/naginator.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/provider/naginator.rb b/lib/puppet/provider/naginator.rb index 5c610fb31..17cc24086 100644 --- a/lib/puppet/provider/naginator.rb +++ b/lib/puppet/provider/naginator.rb @@ -30,7 +30,15 @@ class Puppet::Provider::Naginator < Puppet::Provider::ParsedFile end def self.to_file(records) - header + records.collect { |record| record.to_s }.join("\n").gsub("_naginator_name", NAME_STRING) + header + records.collect { |record| + # Remap the TYPE_name or _naginator_name params to the + # name if the record is a template (register == 0) + if record.to_s =~ /register\s+0/ + record.to_s.sub("_naginator_name", "name").sub(record.type.to_s + "_name", "name") + else + record.to_s.sub("_naginator_name", NAME_STRING) + end + }.join("\n") end def self.skip_record?(record) |