Merge branch 'develop' into neoloc/ntpserver
This commit is contained in:
commit
9bfae72d2e
@ -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':
|
||||||
@ -32,3 +36,4 @@ class profiles::ntp::server (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -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('::', '/') %>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user