Merge branch 'develop' into neoloc/ntpserver

site/profiles/manifests/ntp/server.pp

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