Skip to content

Commit

Permalink
Merge pull request #73 from alexjfisher/allow_latest_stdlib_and_puppet
Browse files Browse the repository at this point in the history
Allow Puppet 6 and remove stdlib dependency
  • Loading branch information
raphink authored May 8, 2019
2 parents 33e8361 + 43fc1a1 commit 002591d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 22 deletions.
5 changes: 0 additions & 5 deletions .fixtures.yml

This file was deleted.

15 changes: 5 additions & 10 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,13 @@
) inherits augeas::params {

if versioncmp($::puppetversion, '4.0.0') >= 0 {
anchor { 'augeas::begin': }
-> class {'::augeas::files': }
-> anchor { 'augeas::end': }
contain 'augeas::files'
} else {
anchor { 'augeas::begin': }
-> class {'::augeas::packages': }
-> class {'::augeas::files': }
-> anchor { 'augeas::end': }
contain 'augeas::packages'
contain 'augeas::files'
Class['augeas::packages'] -> Class['augeas::files']

# lint:ignore:spaceship_operator_without_tag
Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |>
# lint:endignore
Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> # lint:ignore:spaceship_operator_without_tag
}

}
9 changes: 2 additions & 7 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@
"project_page": "https://github.com/camptocamp/puppet-augeas",
"issues_url": "https://github.com/camptocamp/puppet-augeas/issues",
"description": "Augeas Module for Puppet",
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 3.2.0 < 6.0.0"
}
],
"dependencies": [],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.10.0 < 6.0.0"
"version_requirement": ">= 4.10.0 < 7.0.0"
}
],
"operatingsystem_support": [
Expand Down

0 comments on commit 002591d

Please sign in to comment.