opendev
/
system-config
Code Issues Proposed changes

Switch to puppetlabs-ntp. 

Updates our install_modules.sh file so that it uses
puppetlabs-ntp instead of kickstandproject-ntp. This provides
better multi distro NTP support.

Change-Id: I7b11e8c67a2e38653be281b5e6aa1d08768cc617
Reviewed-on: https://review.openstack.org/23204
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Dan Prince 2013-02-28 15:37:22 -05:00 committed by Jenkins
parent 926bf44fe6
commit e52c8739ce
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install_modules.sh
View File

@ -4,7 +4,13 @@ MODULE_PATH=/etc/puppet/modules
# Array of modules to be installed key:value is module:version.
declare -A MODULES
MODULES["kickstandproject-ntp"]="0.0.3"
#NOTE: if we previously installed kickstandproject-ntp we nuke it here
# since puppetlabs-ntp and kickstandproject-ntp install to the same dir
if grep kickstandproject-ntp /etc/puppet/modules/ntp/Modulefile &> /dev/null; then
rm -Rf "/etc/puppet/modules/ntp"
fi
MODULES["puppetlabs-ntp"]="0.2.0"
MODULES["openstackci-dashboard"]="0.0.6"
# freenode #puppet 2012-09-25:

2
modules/openstack_project/manifests/template.pp
View File

@ -19,7 +19,7 @@ class openstack_project::template (
rules6 => $iptables_rules6,
}
class { 'ntp::server': }
class { 'ntp': }
class { 'openstack_project::base':
install_users => $install_users,