promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
2 changed files with 18 additions and 13 deletions
Showing only changes of commit 9bfae72d2e - Show all commits

View File

@ -17,18 +17,23 @@ class profiles::ntp::server (
] $wait_ensure = 'running',
){
# define the server
if $facts['os']['family'] == 'RedHat' {
class { 'chrony':
servers => $peers,
queryhosts => $allowquery,
wait_enable => $wait_enable,
wait_ensure => $wait_ensure,
}
} else {
class { 'chrony':
servers => $peers,
queryhosts => $allowquery,
# check the enc_role has been set, it can take two puppet runs to do this
# TODO: change away from external fact
if $facts['enc_role'] == 'roles::infra::ntpserver' {
# define the server
if $facts['os']['family'] == 'RedHat' {
class { 'chrony':
servers => $peers,
queryhosts => $allowquery,
wait_enable => $wait_enable,
wait_ensure => $wait_ensure,
}
} else {
class { 'chrony':
servers => $peers,
queryhosts => $allowquery,
}
}
}
}

View File

@ -1,2 +1,2 @@
enc_role=<%= @enc_role[0] %>
enc_role=<%= @enc_role[0].gsub('::', '/') %>
enc_role_path=<%= @enc_role[0].gsub('::', '/') %>