-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
286acba Merge pull request #252 from anodelman/master d4ef5a5 (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... b6d8f57 Merge pull request #251 from cmurphy/rspec-puppet-2 dffe18d Update .travis.yml fbb8043 Keep testing on puppet 2.7 78183a1 Fix lint warnings and ensure lint fails on warnings 44dd107 Remove unneeded dependencies 3a0e780 Update tests for rspec-puppet 2
- Loading branch information
Showing
9 changed files
with
61 additions
and
28 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,9 @@ | ||
--- | ||
.travis.yml: | ||
extras: | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" | ||
spec/spec_helper.rb: | ||
unmanaged: true |
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 |
---|---|---|
@@ -1,17 +1,28 @@ | ||
--- | ||
sudo: false | ||
language: ruby | ||
bundler_args: --without system_tests | ||
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'" | ||
matrix: | ||
fast_finish: true | ||
include: | ||
- rvm: 1.9.3 | ||
env: PUPPET_GEM_VERSION="~> 3.4.0" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" | ||
env: PUPPET_GEM_VERSION="~> 3.0" | ||
- rvm: 1.9.3 | ||
env: PUPPET_GEM_VERSION="~> 3.0" | ||
- rvm: 2.0.0 | ||
- rvm: 1.9.3 | ||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" | ||
- rvm: 2.1.5 | ||
env: PUPPET_GEM_VERSION="~> 3.0" | ||
- rvm: 2.1.5 | ||
env: PUPPET_GEM_VERSION="~> 3.4.0" | ||
- rvm: 2.1.5 | ||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" | ||
- rvm: 1.8.7 | ||
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" | ||
notifications: | ||
email: false |
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 |
---|---|---|
@@ -1,22 +1,22 @@ | ||
# | ||
class ntp::config inherits ntp { | ||
|
||
if $keys_enable { | ||
$directory = ntp_dirname($keys_file) | ||
if $ntp::keys_enable { | ||
$directory = ntp_dirname($ntp::keys_file) | ||
file { $directory: | ||
ensure => directory, | ||
owner => 0, | ||
group => 0, | ||
mode => '0755', | ||
ensure => directory, | ||
owner => 0, | ||
group => 0, | ||
mode => '0755', | ||
} | ||
} | ||
|
||
file { $config: | ||
file { $ntp::config: | ||
ensure => file, | ||
owner => 0, | ||
group => 0, | ||
mode => '0644', | ||
content => template($config_template), | ||
content => template($ntp::config_template), | ||
} | ||
|
||
} |
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