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
This commit is contained in:
Paul Belanger 2012-10-02 13:34:11 -04:00 committed by Jenkins
parent 3bff88868b
commit fc98e36fe3
3 changed files with 4 additions and 16 deletions

View File

@ -29,6 +29,7 @@ fi
# Array of modules to be installed key:value is module:version. # Array of modules to be installed key:value is module:version.
declare -A MODULES declare -A MODULES
MODULES["kickstandproject-ntp"]="0.0.3"
MODULES["openstackci-dashboard"]="0.0.4" MODULES["openstackci-dashboard"]="0.0.4"
# freenode #puppet 2012-09-25: # freenode #puppet 2012-09-25:

View File

@ -1,15 +0,0 @@
class ntp {
package { "ntp":
ensure => installed
}
service { 'ntpd':
name => 'ntp',
ensure => running,
enable => true,
hasrestart => true,
require => Package['ntp'],
}
}

View File

@ -4,7 +4,6 @@ class openstack_project::template (
$install_users = true, $install_users = true,
$certname = $fqdn $certname = $fqdn
) { ) {
include ntp
include ssh include ssh
include snmpd include snmpd
include unattended_upgrades include unattended_upgrades
@ -12,6 +11,9 @@ class openstack_project::template (
class { 'iptables': class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports, public_tcp_ports => $iptables_public_tcp_ports,
} }
class { 'ntp::server': }
class { 'openstack_project::base': class { 'openstack_project::base':
install_users => $install_users, install_users => $install_users,
certname => $certname, certname => $certname,