diff --git a/site/profiles/manifests/ntp/server.pp b/site/profiles/manifests/ntp/server.pp index 0739737..c2f9b83 100644 --- a/site/profiles/manifests/ntp/server.pp +++ b/site/profiles/manifests/ntp/server.pp @@ -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, + } } } } diff --git a/site/profiles/templates/base/facts/enc_role.erb b/site/profiles/templates/base/facts/enc_role.erb index 69c6d06..dbef811 100644 --- a/site/profiles/templates/base/facts/enc_role.erb +++ b/site/profiles/templates/base/facts/enc_role.erb @@ -1,2 +1,2 @@ enc_role=<%= @enc_role[0] %> -enc_role=<%= @enc_role[0].gsub('::', '/') %> +enc_role_path=<%= @enc_role[0].gsub('::', '/') %>