Skip to content

Enable force sync #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enable force sync #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f7b421
Changes needed for Travis to build without errors or warnings.
erobhal May 25, 2016
0a68d31
Changes needed for Travis to build without errors or warnings.
erobhal May 25, 2016
fbc0ed1
Make it possible to set NTPD_FORCE_SYNC_ON_STARTUP and NTPD_FORCE_SYN…
erobhal May 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ end

gem 'metadata-json-lint'
gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 1.0.0'
gem 'facter', '>= 1.7.0'
gem 'rspec-puppet'
gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-alias-check'
gem 'puppet-lint-empty_string-check'
Expand All @@ -24,7 +24,9 @@ gem 'puppet-lint-undef_in_function-check'
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-variable_contains_upcase'

# rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
# rspec must be v2 for ruby 1.8.7
gem 'rspec', '~> 2.0'
# rake >= 11 does not support ruby 1.8.7
gem 'rake', '~> 10.0'
end
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ String with startup options to pass to ntp.

- *Default*: 'USE_DEFAULTS'

sysconfig_force_sync_on_startup
-----------------
Set NTPD_FORCE_SYNC_ON_STARTUP on SLES11 and SLES12. Valid values are 'yes' and 'no'.

- *Default*: 'UNSET'

sysconfig_force_sync_hwclock_on_startup
-----------------
Set NTPD_FORCE_SYNC_HWCLACK_ON_STARTUP on SLES11 and SLES12. Valid values are 'yes' and 'no'.

- *Default*: 'UNSET'

step_tickers_ensure
-------------------
Ensure step tickers file. Valid values are 'present' and 'absent'.
Expand Down
106 changes: 68 additions & 38 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,45 @@
# This module manages the ntp service.
#
class ntp (
$config_file_owner = 'root',
$config_file_group = 'root',
$config_file_mode = '0644',
$package_latest = false,
$package_name = 'USE_DEFAULTS',
$package_noop = 'USE_DEFAULTS',
$package_source = 'USE_DEFAULTS',
$package_adminfile = 'USE_DEFAULTS',
$service_name = 'USE_DEFAULTS',
$config_file = 'USE_DEFAULTS',
$driftfile = 'USE_DEFAULTS',
$service_running = true,
$service_hasstatus = true,
$service_hasrestart = true,
$keys = 'USE_DEFAULTS',
$servers = ['0.us.pool.ntp.org',
'1.us.pool.ntp.org',
'2.us.pool.ntp.org'],
$server_options = 'UNSET',
$peers = 'UNSET',
$restrict_options = 'USE_DEFAULTS',
$restrict_localhost = 'USE_DEFAULTS',
$step_tickers_ensure = 'USE_DEFAULTS',
$step_tickers_path = '/etc/ntp/step-tickers',
$step_tickers_owner = 'root',
$step_tickers_group = 'root',
$step_tickers_mode = '0644',
$orphan_mode_stratum = 'UNSET',
$fudge_stratum = '10',
$enable_stats = false,
$enable_tinker = 'USE_DEFAULTS',
$statsdir = '/var/log/ntpstats/',
$logfile = 'UNSET',
$ignore_local_clock = false,
$disable_monitor = true,
$sysconfig_path = 'USE_DEFAULTS',
$sysconfig_options = 'USE_DEFAULTS',
$config_file_owner = 'root',
$config_file_group = 'root',
$config_file_mode = '0644',
$package_latest = false,
$package_name = 'USE_DEFAULTS',
$package_noop = 'USE_DEFAULTS',
$package_source = 'USE_DEFAULTS',
$package_adminfile = 'USE_DEFAULTS',
$service_name = 'USE_DEFAULTS',
$config_file = 'USE_DEFAULTS',
$driftfile = 'USE_DEFAULTS',
$service_running = true,
$service_hasstatus = true,
$service_hasrestart = true,
$keys = 'USE_DEFAULTS',
$servers = ['0.us.pool.ntp.org',
'1.us.pool.ntp.org',
'2.us.pool.ntp.org'],
$server_options = 'UNSET',
$peers = 'UNSET',
$restrict_options = 'USE_DEFAULTS',
$restrict_localhost = 'USE_DEFAULTS',
$step_tickers_ensure = 'USE_DEFAULTS',
$step_tickers_path = '/etc/ntp/step-tickers',
$step_tickers_owner = 'root',
$step_tickers_group = 'root',
$step_tickers_mode = '0644',
$orphan_mode_stratum = 'UNSET',
$fudge_stratum = '10',
$enable_stats = false,
$enable_tinker = 'USE_DEFAULTS',
$statsdir = '/var/log/ntpstats/',
$logfile = 'UNSET',
$ignore_local_clock = false,
$disable_monitor = true,
$sysconfig_path = 'USE_DEFAULTS',
$sysconfig_options = 'USE_DEFAULTS',
$sysconfig_force_sync_on_startup = 'USE_DEFAULTS',
$sysconfig_force_sync_hwclock_on_startup = 'USE_DEFAULTS',
) {

# validate type as array or fail
Expand Down Expand Up @@ -144,6 +146,8 @@
$default_sysconfig_path = '/etc/default/ntp'
$sysconfig_erb = 'sysconfig.debian.erb'
$default_sysconfig_options = '-g'
$default_sysconfig_force_sync_on_startup = undef
$default_sysconfig_force_sync_hwclock_on_startup = undef
}
'RedHat': {
$default_package_name = [ 'ntp' ]
Expand All @@ -158,6 +162,8 @@
$default_keys = '/etc/ntp/keys'
$default_enable_tinker = true
$default_sysconfig_path = '/etc/sysconfig/ntpd'
$default_sysconfig_force_sync_on_startup = undef
$default_sysconfig_force_sync_hwclock_on_startup = undef
case $::operatingsystemrelease {
/^5/: {
$default_driftfile = '/var/lib/ntp/ntp.drift'
Expand Down Expand Up @@ -198,23 +204,31 @@
$default_package_name = [ 'xntp' ]
$default_service_name = 'ntp'
$default_sysconfig_options = '-u ntp'
$default_sysconfig_force_sync_on_startup = undef
$default_sysconfig_force_sync_hwclock_on_startup = undef
$sysconfig_erb = 'sysconfig.suse9.erb'
}
/^10/: {
$default_package_name = [ 'xntp' ]
$default_service_name = 'ntp'
$default_sysconfig_options = '-u ntp'
$default_sysconfig_force_sync_on_startup = undef
$default_sysconfig_force_sync_hwclock_on_startup = undef
$sysconfig_erb = 'sysconfig.suse10.erb'
}
/^11/: {
$default_package_name = [ 'ntp' ]
$default_service_name = 'ntp'
$default_sysconfig_options = '-g -u ntp:ntp'
$default_sysconfig_force_sync_on_startup = 'no'
$default_sysconfig_force_sync_hwclock_on_startup = 'no'
$sysconfig_erb = 'sysconfig.suse11.erb'
}
/^12/: {
$default_package_name = [ 'ntp' ]
$default_sysconfig_options = '-g -u ntp:ntp'
$default_sysconfig_force_sync_on_startup = 'no'
$default_sysconfig_force_sync_hwclock_on_startup = 'yes'
$sysconfig_erb = 'sysconfig.suse12.erb'
if $::operatingsystem == 'OpenSuSE' {
$default_service_name = 'ntp'
Expand Down Expand Up @@ -252,9 +266,13 @@
$default_driftfile = '/var/ntp/ntp.drift'
$default_keys = '/etc/inet/ntp.keys'
$default_enable_tinker = false
$default_sysconfig_force_sync_on_startup = undef
$default_sysconfig_force_sync_hwclock_on_startup = undef
$default_sysconfig_path = undef
$default_sysconfig_options = undef
}
default: {
fail("The ntp module is supported by OS Families Debian, RedHat, Suse, and Solaris. Your operatingsystem, ${::operatingsystem}, is part of the osfamily, ${::osfamily}")
fail("The ntp module is supported by OS Families Debian, RedHat, Suse, and Solaris. Your are running ${::osfamily}")
}
}

Expand Down Expand Up @@ -375,6 +393,18 @@
$sysconfig_options_real = $sysconfig_options
}

if $sysconfig_force_sync_on_startup == 'USE_DEFAULTS' {
$sysconfig_force_sync_on_startup_real = $default_sysconfig_force_sync_on_startup
} else {
$sysconfig_force_sync_on_startup_real = $sysconfig_force_sync_on_startup
}

if $sysconfig_force_sync_hwclock_on_startup == 'USE_DEFAULTS' {
$sysconfig_force_sync_hwclock_on_startup_real = $default_sysconfig_force_sync_hwclock_on_startup
} else {
$sysconfig_force_sync_hwclock_on_startup_real = $sysconfig_force_sync_hwclock_on_startup
}

if ($package_adminfile_real != '') and ($package_adminfile_real != undef) {

file { 'admin_file':
Expand Down
Loading