Skip to content
This repository has been archived by the owner on Sep 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #4 from nick-markowski/p5_oel
Browse files Browse the repository at this point in the history
Added support for Puppet 5
  • Loading branch information
cristifalcas authored Sep 24, 2018
2 parents 00114b6 + 10c4b23 commit 8781b59
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
1 change: 1 addition & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
fixtures:
repositories:
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
symlinks:
journald: "#{source_dir}"

8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ matrix:
fast_finish: true
include:
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
env: PUPPET_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
env: PUPPET_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.4.4
env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes"
sudo: false
12 changes: 5 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
source 'https://rubygems.org'

gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 2.7'
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '>= 2.7'

gem 'rake'
gem 'rspec', '~> 3.0'
gem 'rspec-puppet', '~> 2.3'
gem 'rspec-puppet-facts', '>= 1.7'
gem 'puppetlabs_spec_helper', '>= 0.8.0'
gem 'rspec'
gem 'rspec-puppet'
gem 'rspec-puppet-facts'
gem 'puppetlabs_spec_helper'
gem 'puppet-lint'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-appends-check'
gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-file_ensure-check'
Expand All @@ -23,7 +22,6 @@ gem 'puppet-lint-strict_indent-check'
gem 'puppet-lint-trailing_comma-check'
gem 'puppet-lint-undef_in_function-check'
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-usascii_format-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-version_comparison-check'
gem 'simplecov'
Expand Down
3 changes: 1 addition & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
contain ::journald::config
contain ::journald::service

Class['journald::config'] ~>
Class['journald::service']
Class['journald::config'] ~> Class['journald::service']

}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cristifalcas-journald",
"author": "Cristian Falcas",
"version": "0.6.0",
"version": "0.6.1",
"source": "[email protected]:cristifalcas/puppet-journald.git",
"project_page": "https://github.com/cristifalcas/puppet-journald",
"issues_url": "https://github.com/cristifalcas/puppet-journald/issues",
Expand Down

0 comments on commit 8781b59

Please sign in to comment.