From fc98e36fe3aed59388f24f554a986fd6ab474c68 Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Tue, 2 Oct 2012 13:34:11 -0400
Subject: [PATCH] Use NTP puppet module from forge.puppetlabs.com

After some discussion in #openstack-infra using modules from puppetforge
is a good thing.  So, this is a simple change to use an existing module
that I maintain.

Change-Id: Ic2290ef10ff96220b6620958537730e828e59402
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/13959
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 install_modules.sh                              |  1 +
 modules/ntp/manifests/init.pp                   | 15 ---------------
 modules/openstack_project/manifests/template.pp |  4 +++-
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 modules/ntp/manifests/init.pp

diff --git a/install_modules.sh b/install_modules.sh
index f73afb087f..b81a843b15 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -29,6 +29,7 @@ fi
 
 # Array of modules to be installed key:value is module:version.
 declare -A MODULES
+MODULES["kickstandproject-ntp"]="0.0.3"
 MODULES["openstackci-dashboard"]="0.0.4"
 
 # freenode #puppet 2012-09-25:
diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
deleted file mode 100644
index a797bb9171..0000000000
--- a/modules/ntp/manifests/init.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class ntp {
-
-  package { "ntp":
-    ensure => installed
-  }
-
-  service { 'ntpd':
-    name       => 'ntp',
-    ensure     => running,
-    enable     => true,
-    hasrestart => true,
-    require => Package['ntp'],
-  }
-
-}
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 5a0fa26d5a..04893224ac 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -4,7 +4,6 @@ class openstack_project::template (
   $install_users = true,
   $certname = $fqdn
   ) {
-  include ntp
   include ssh
   include snmpd
   include unattended_upgrades
@@ -12,6 +11,9 @@ class openstack_project::template (
   class { 'iptables':
     public_tcp_ports => $iptables_public_tcp_ports,
   }
+
+  class { 'ntp::server': }
+
   class { 'openstack_project::base':
     install_users => $install_users,
     certname => $certname,