forked from redhat-openstack/openstack-puppet-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Uses the LoadPlugin syntax with bracket when supported
This is fully backwards compatible. The version check is done exactly how it's supposed to ; I checked the sources of collectd to be sure there's no conflict. Globals has always defaulted to false so I'm making it default to false in this module. I'm not setting it undef because that's a boolean and we got issues with checking if a boolean is false or undef (see redhat-openstack#182).
- Loading branch information
txaj
committed
Dec 11, 2014
1 parent
1b75c78
commit b671d00
Showing
3 changed files
with
22 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Generated by Puppet | ||
<% if @collectd_version and (scope.function_versioncmp([@collectd_version, '4.9.4']) >= 0) -%> | ||
<LoadPlugin <%= @plugin %>> | ||
Globals <%= @globals %> | ||
<% if @interval and @collectd_version and (scope.function_versioncmp([@collectd_version, '5.2']) >= 0) -%> | ||
Interval <%= @interval %> | ||
<% end -%> | ||
</LoadPlugin> | ||
<% else -%> | ||
LoadPlugin <%= @plugin %> | ||
<% end -%> | ||
|
||
<%= @content %> |