Skip to content

Commit

Permalink
Update ntp to 8cf93ec
Browse files Browse the repository at this point in the history
8cf93ec Merge pull request redhat-openstack#269 from puppetlabs/travisci_update
4d07297 Updated travisci file for Puppet 4
10b30e6 Merge pull request redhat-openstack#268 from DavidS/modules-2087-fix-debian-default-config
2492fc2 (MODULES-2087) fix default configuration for Debian

Change-Id: Idc6340bcfa92c64bcb0f98af5704e199abd81b15
  • Loading branch information
xbezdick committed Jun 8, 2015
1 parent 0849ca9 commit f9cc4f0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ mod 'nssdb',
:git => 'https://github.com/rcritten/puppet-nssdb.git'

mod 'ntp',
:commit => 'c0613256dfcec3fb0ec20ef42c9d9e47f0412648',
:commit => '8cf93ec7a1ddad14e2c59d8bcff0ddafed94dd7c',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp'

mod 'openstack_extras',
Expand Down
3 changes: 0 additions & 3 deletions ntp/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,5 @@ matrix:
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"
allow_failures:
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications:
email: false
2 changes: 1 addition & 1 deletion ntp/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
$driftfile = $default_driftfile
$package_name = $default_package_name
$restrict = [
'-4 kod nomodify notrap nopeer noquery',
'-4 default kod nomodify notrap nopeer noquery',
'-6 default kod nomodify notrap nopeer noquery',
'127.0.0.1',
'::1',
Expand Down

0 comments on commit f9cc4f0

Please sign in to comment.