Skip to content

Commit

Permalink
Merge pull request #663 from puppetlabs/CONT-360-Syntax_update
Browse files Browse the repository at this point in the history 
(CONT-360) Syntax update
  • Loading branch information
@david22swan
david22swan authored Jan 24, 2023
2 parents becb100 + 9c6c577 commit 1b82962
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 105 deletions.
5 changes: 0 additions & 5 deletions .puppet-lint.rc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
--relative
--no-legacy_facts-check
--no-top_scope_facts-check
--no-topscope_variable-check
--no-relative_classname_reference-check
--no-variables_not_enclosed-check
6 changes: 0 additions & 6 deletions .sync.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ Rakefile:
t.rspec_opts = "--tag integration"
end
end
extra_disabled_lint_checks:
- legacy_facts
- top_scope_facts
- topscope_variable
- relative_classname_reference
- variables_not_enclosed
spec/spec_helper.rb:
mock_with: ":rspec"
coverage_report: true
Expand Down
6 changes: 0 additions & 6 deletions Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ def changelog_future_release
end

PuppetLint.configuration.send('disable_relative')
PuppetLint.configuration.send('disable_legacy_facts')
PuppetLint.configuration.send('disable_top_scope_facts')
PuppetLint.configuration.send('disable_topscope_variable')
PuppetLint.configuration.send('disable_relative_classname_reference')
PuppetLint.configuration.send('disable_variables_not_enclosed')


if Bundler.rubygems.find_name('github_changelog_generator').any?
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
Expand Down
26 changes: 13 additions & 13 deletions manifests/config.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
#
class ntp::config {
#The servers-netconfig file overrides NTP config on SLES 12, interfering with our configuration.
if ($facts['operatingsystem'] == 'SLES' and $facts['operatingsystemmajrelease'] == '12') or
($facts['operatingsystem'] == 'OpenSuSE' and $facts['operatingsystemmajrelease'] == '42') {
if ($facts['os']['name'] == 'SLES' and $facts['os']['release']['major'] == '12') or
($facts['os']['name'] == 'OpenSuSE' and $facts['os']['release']['major'] == '42') {
file { '/var/run/ntp/servers-netconfig':
ensure => 'absent',
}
}

case $::osfamily {
case $facts['os']['family'] {
'redhat': {
$daemon_config = '/etc/sysconfig/ntpd'
if $ntp::daemon_extra_opts {
Expand All @@ -23,7 +23,7 @@
match => '^OPTIONS\=',
}
}
if $ntp::user and $facts['operatingsystemmajrelease'] != '6' {
if $ntp::user and $facts['os']['release']['major'] != '6' {
file_line { 'Set NTPD daemon user':
ensure => present,
path => '/etc/systemd/system/multi-user.target.wants/ntpd.service',
Expand All @@ -42,7 +42,7 @@
match => '^NTPD_OPTS\=',
}
}
if $ntp::user and $facts['operatingsystemmajrelease'] == '18.04' {
if $ntp::user and $facts['os']['release']['major'] == '18.04' {
file_line { 'Set NTPD daemon user':
ensure => present,
path => '/usr/lib/ntp/ntp-systemd-wrapper',
Expand Down Expand Up @@ -106,29 +106,29 @@
ensure => file,
owner => 0,
group => 0,
mode => $::ntp::config_file_mode,
mode => $ntp::config_file_mode,
content => $config_content,
}

#If both epp and erb are defined, throw validation error.
#Otherwise use the defined erb/epp template, or use default

if $::ntp::step_tickers_file {
if $::ntp::step_tickers_template and $::ntp::step_tickers_epp {
if $ntp::step_tickers_file {
if $ntp::step_tickers_template and $ntp::step_tickers_epp {
fail('Cannot supply both step_tickers_file and step_tickers_epp templates for step ticker file')
} elsif $::ntp::step_tickers_template {
} elsif $ntp::step_tickers_template {
$step_ticker_content = template($ntp::step_tickers_template)
} elsif $::ntp::step_tickers_epp {
$step_ticker_content = epp($::ntp::step_tickers_epp)
} elsif $ntp::step_tickers_epp {
$step_ticker_content = epp($ntp::step_tickers_epp)
} else {
$step_ticker_content = epp('ntp/step-tickers.epp')
}

file { $::ntp::step_tickers_file:
file { $ntp::step_tickers_file:
ensure => file,
owner => 0,
group => 0,
mode => $::ntp::config_file_mode,
mode => $ntp::config_file_mode,
content => $step_ticker_content,
}
}
Expand Down
146 changes: 73 additions & 73 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,76 +238,76 @@
# This is currently restricted to Redhat based systems of version 7 and above and Ubuntu 18.04.
#
class ntp (
Boolean $broadcastclient,
Boolean $burst,
Stdlib::Absolutepath $config,
Optional[Stdlib::Absolutepath] $config_dir,
String $config_file_mode,
Optional[String] $config_epp,
Optional[String] $config_template,
Boolean $disable_auth,
Boolean $disable_dhclient,
Boolean $disable_kernel,
Boolean $disable_monitor,
Boolean $enable_mode7,
Optional[Array[String]] $fudge,
Stdlib::Absolutepath $driftfile,
Optional[Stdlib::Absolutepath] $leapfile,
Optional[Stdlib::Absolutepath] $logfile,
Optional[Variant[String, Integer]] $logfile_group,
String $logfile_mode,
Optional[Variant[String, Integer]] $logfile_user,
Optional[String] $logconfig,
Boolean $iburst_enable,
Array[String] $keys,
Boolean $keys_enable,
Stdlib::Absolutepath $keys_file,
Optional[Ntp::Key_id] $keys_controlkey,
Optional[Ntp::Key_id] $keys_requestkey,
Optional[Array[Ntp::Key_id]] $keys_trusted,
Optional[Ntp::Poll_interval] $minpoll,
Optional[Ntp::Poll_interval] $maxpoll,
String $package_ensure,
Boolean $package_manage,
Array[String] $package_name,
Optional[Integer[0]] $panic,
Array[String] $peers,
Optional[Array[String]] $pool,
Array[String] $preferred_servers,
Array[String] $noselect_servers,
Array[String] $restrict,
Array[String] $interfaces,
Array[String] $interfaces_ignore,
Array[String] $servers,
Boolean $service_enable,
Enum['running', 'stopped'] $service_ensure,
Boolean $service_manage,
String $service_name,
Optional[String] $service_provider,
Boolean $service_hasstatus,
Boolean $service_hasrestart,
Optional[Enum['yes','no']] $slewalways,
Optional[Array] $statistics,
Optional[Stdlib::Absolutepath] $statsdir,
Optional[Integer[0, 65535]] $stepout,
Optional[Stdlib::Absolutepath] $step_tickers_file,
Optional[String] $step_tickers_epp,
Optional[String] $step_tickers_template,
Optional[Boolean] $tinker,
Boolean $tos,
Optional[Integer[1]] $tos_maxclock,
Optional[Integer[1]] $tos_minclock,
Optional[Integer[1]] $tos_minsane,
Optional[Integer[1]] $tos_floor,
Optional[Integer[1]] $tos_ceiling,
Optional[Integer[1]] $tos_orphan,
Variant[Boolean, Integer[0,1]] $tos_cohort,
Boolean $udlc,
Optional[Integer[1,15]] $udlc_stratum,
Optional[Stdlib::Absolutepath] $ntpsigndsocket,
Optional[String] $authprov,
Optional[String] $user,
Optional[String] $daemon_extra_opts,
Boolean $broadcastclient,
Boolean $burst,
Stdlib::Absolutepath $config,
Optional[Stdlib::Absolutepath] $config_dir,
String $config_file_mode,
Optional[String] $config_epp,
Optional[String] $config_template,
Boolean $disable_auth,
Boolean $disable_dhclient,
Boolean $disable_kernel,
Boolean $disable_monitor,
Boolean $enable_mode7,
Optional[Array[String]] $fudge,
Stdlib::Absolutepath $driftfile,
Optional[Stdlib::Absolutepath] $leapfile,
Optional[Stdlib::Absolutepath] $logfile,
Optional[Variant[String, Integer]] $logfile_group,
String $logfile_mode,
Optional[Variant[String, Integer]] $logfile_user,
Optional[String] $logconfig,
Boolean $iburst_enable,
Array[String] $keys,
Boolean $keys_enable,
Stdlib::Absolutepath $keys_file,
Optional[Ntp::Key_id] $keys_controlkey,
Optional[Ntp::Key_id] $keys_requestkey,
Optional[Array[Ntp::Key_id]] $keys_trusted,
Optional[Ntp::Poll_interval] $minpoll,
Optional[Ntp::Poll_interval] $maxpoll,
String $package_ensure,
Boolean $package_manage,
Array[String] $package_name,
Optional[Integer[0]] $panic,
Array[String] $peers,
Optional[Array[String]] $pool,
Array[String] $preferred_servers,
Array[String] $noselect_servers,
Array[String] $restrict,
Array[String] $interfaces,
Array[String] $interfaces_ignore,
Array[String] $servers,
Boolean $service_enable,
Enum['running', 'stopped'] $service_ensure,
Boolean $service_manage,
String $service_name,
Optional[String] $service_provider,
Boolean $service_hasstatus,
Boolean $service_hasrestart,
Optional[Enum['yes','no']] $slewalways,
Optional[Array] $statistics,
Optional[Stdlib::Absolutepath] $statsdir,
Optional[Integer[0, 65535]] $stepout,
Optional[Stdlib::Absolutepath] $step_tickers_file,
Optional[String] $step_tickers_epp,
Optional[String] $step_tickers_template,
Optional[Boolean] $tinker,
Boolean $tos,
Optional[Integer[1]] $tos_maxclock,
Optional[Integer[1]] $tos_minclock,
Optional[Integer[1]] $tos_minsane,
Optional[Integer[1]] $tos_floor,
Optional[Integer[1]] $tos_ceiling,
Optional[Integer[1]] $tos_orphan,
Variant[Boolean, Integer[0,1]] $tos_cohort,
Boolean $udlc,
Optional[Integer[1,15]] $udlc_stratum,
Optional[Stdlib::Absolutepath] $ntpsigndsocket,
Optional[String] $authprov,
Optional[String] $user,
Optional[String] $daemon_extra_opts,
) {
# defaults for tinker and panic are different, when running on virtual machines
if $facts['is_virtual'] {
Expand All @@ -322,7 +322,7 @@
contain ntp::config
contain ntp::service

Class['::ntp::install']
-> Class['::ntp::config']
~> Class['::ntp::service']
Class['ntp::install']
-> Class['ntp::config']
~> Class['ntp::service']
}
4 changes: 2 additions & 2 deletions plans/acceptance/provision_integration.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
Optional[String] $provision_type = 'provision_service',
) {
#provision server machine, set role
run_task("provision::$provision_type", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpserver')
run_task("provision::$provision_type", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpclient')
run_task("provision::${provision_type}", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpserver')
run_task("provision::${provision_type}", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpclient')
}

0 comments on commit 1b82962

Please sign in to comment.