Merge branch 'develop' into neoloc/ntpserver

This commit is contained in:
Ben Vincent 2023-11-11 00:06:42 +11:00
commit 9bfae72d2e
2 changed files with 18 additions and 13 deletions

View File

@ -17,6 +17,10 @@ class profiles::ntp::server (
] $wait_ensure = 'running', ] $wait_ensure = 'running',
){ ){
# 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 # define the server
if $facts['os']['family'] == 'RedHat' { if $facts['os']['family'] == 'RedHat' {
class { 'chrony': class { 'chrony':
@ -31,4 +35,5 @@ class profiles::ntp::server (
queryhosts => $allowquery, queryhosts => $allowquery,
} }
} }
}
} }

View File

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