Skip to content

Commit

Permalink
Merge pull request #286 from roidelapluie/pup3
Browse files Browse the repository at this point in the history
Add Puppet Compatibility to metadata.json
  • Loading branch information
bastelfreak authored Jun 16, 2016
2 parents eb4be58 + a749b8d commit bb34bf9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Cs\_primitive[unmanaged\_metadata] parameter (#275)
- Support Debian 8. Requires jessie-backports apt repository (not included in
this module) (#282)
- Set Puppet requirement version to >= 3.0.0 < 5.0.0 (#286)

### Backward incompatible changes
- Cs\_primitive[manage\_target\_role] parameter (introduced in 1.1.0, deprecated
Expand All @@ -13,6 +14,11 @@
- The class parameter corosync::packages has been removed (was deprecated in
0.8.0) (#282)

### Deprecation notes

We will remove support for Puppet <= 3.6.0 in two major releases of this module
(4.0.0).

## 2016-06-16 - Release 1.2.1
### Summary
- Workaround upstream Puppet bug regarding PuppetX ruby namespace (#278 #284
Expand Down
1 change: 1 addition & 0 deletions lib/puppet_x/voxpupuli/corosync/provider/cib_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def self.run_command_in_cib(cmd, cib = nil, failonfail = true)
debug("Executing #{cmd} in the CIB") if cib.nil?
debug("Executing #{cmd} in the shadow CIB \"#{cib}\"") unless cib.nil?
if Puppet::Util::Package.versioncmp(Puppet::PUPPETVERSION, '3.4') == -1
Puppet.deprecation_warning 'voxpupuli-corosync: Support for Puppet < 3.6 will be dropped in the release 4.0.0 of the voxpupuli-corosync module'
raw, status = Puppet::Util::SUIDManager.run_and_capture(cmd, nil, nil, custom_environment)
else
raw = Puppet::Util::Execution.execute(cmd, { failonfail: failonfail }.merge(custom_environment))
Expand Down
4 changes: 4 additions & 0 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
}
],
"dependencies": [
{
"name": "puppet",
"version_requirement": ">= 3.0.0 < 5.0.0"
},
{
"name": "puppetlabs/stdlib",
"version_requirement": "4.x"
Expand Down

0 comments on commit bb34bf9

Please sign in to comment.