diff --git a/.fixtures.yml b/.fixtures.yml deleted file mode 100644 index f074a0f..0000000 --- a/.fixtures.yml +++ /dev/null @@ -1,5 +0,0 @@ -fixtures: - repositories: - "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" - symlinks: - "augeas": "#{source_dir}" diff --git a/manifests/init.pp b/manifests/init.pp index 94e50b9..105f7a1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 } } diff --git a/metadata.json b/metadata.json index 9812adc..638fc29 100644 --- a/metadata.json +++ b/metadata.json @@ -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": [