summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2011-02-23 17:44:51 -0500
committerJeff McCune <jeff@puppetlabs.com>2011-02-23 17:44:51 -0500
commit63e39d6f50c3286fe27cb98a61c97eb9ab13c690 (patch)
tree93840a7a9cf09c8e7e520c3c555718a49ad268c0
parent7b1e00cceff4571371298beb819eda5fc7c6ccda (diff)
Add Enterprise Linux supportv0.0.2
-rw-r--r--Modulefile6
-rw-r--r--manifests/init.pp27
-rw-r--r--templates/ntp.conf.debian.erb2
-rw-r--r--templates/ntp.conf.el.erb8
4 files changed, 32 insertions, 11 deletions
diff --git a/Modulefile b/Modulefile
index 180cb31..cd60026 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,10 +1,10 @@
name 'operator-ntp'
-version '0.0.1'
+version '0.0.2'
source 'UNKNOWN'
author 'Example.com Operator'
license 'UNKNOWN'
-summary 'UNKNOWN'
-description 'UNKNOWN'
+summary 'NTP Module'
+description 'NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL'
project_page 'UNKNOWN'
## Add dependencies, if any:
diff --git a/manifests/init.pp b/manifests/init.pp
index 622b216..ee655f7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,10 +30,7 @@
# }
#
# [Remember: No empty lines between comments and class definition]
-class ntp($servers=[ "0.debian.pool.ntp.org iburst",
- "1.debian.pool.ntp.org iburst",
- "2.debian.pool.ntp.org iburst",
- "3.debian.pool.ntp.org iburst",],
+class ntp($servers="UNSET",
$ensure="running",
$autoupdate=false
) {
@@ -57,6 +54,28 @@ class ntp($servers=[ "0.debian.pool.ntp.org iburst",
$svc_name = "ntp"
$config = "/etc/ntp.conf"
$config_tpl = "ntp.conf.debian.erb"
+ if ($servers == "UNSET") {
+ $servers_real = [ "0.debian.pool.ntp.org iburst",
+ "1.debian.pool.ntp.org iburst",
+ "2.debian.pool.ntp.org iburst",
+ "3.debian.pool.ntp.org iburst", ]
+ } else {
+ $servers_real = $servers
+ }
+ }
+ centos, redhat, oel: {
+ $supported = true
+ $pkg_name = [ "ntp" ]
+ $svc_name = "ntpd"
+ $config = "/etc/ntp.conf"
+ $config_tpl = "ntp.conf.el.erb"
+ if ($servers == "UNSET") {
+ $servers_real = [ "0.centos.pool.ntp.org",
+ "1.centos.pool.ntp.org",
+ "2.centos.pool.ntp.org", ]
+ } else {
+ $servers_real = $servers
+ }
}
default: {
$supported = false
diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb
index e4275de..f51414f 100644
--- a/templates/ntp.conf.debian.erb
+++ b/templates/ntp.conf.debian.erb
@@ -20,7 +20,7 @@ filegen clockstats file clockstats type day enable
# pool: <http://www.pool.ntp.org/join.html>
# Managed by puppet class { "ntp": servers => [ ... ] }
-<% servers.each do |server| -%>
+<% servers_real.each do |server| -%>
server <%= server %>
<% end -%>
diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb
index cfb4c8c..db2aa9c 100644
--- a/templates/ntp.conf.el.erb
+++ b/templates/ntp.conf.el.erb
@@ -14,9 +14,11 @@ restrict -6 ::1
# Use public servers from the pool.ntp.org project.
# Please consider joining the pool (http://www.pool.ntp.org/join.html).
-server 0.centos.pool.ntp.org
-server 1.centos.pool.ntp.org
-server 2.centos.pool.ntp.org
+
+# Managed by puppet class { "ntp": servers => [ ... ] }
+<% servers_real.each do |server| -%>
+server <%= server %>
+<% end -%>
#broadcast 192.168.1.255 key 42 # broadcast server
#broadcastclient # broadcast client