Merge branch 'develop' into neoloc/ntpserver

site/profiles/manifests/ntp/server.pp

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

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('::', '/') %>