From e52c8739ce1ac1352ea6209fbc931d34a17e6251 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 28 Feb 2013 15:37:22 -0500 Subject: [PATCH] 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 Reviewed-by: James E. Blair Reviewed-by: Clark Boylan Approved: James E. Blair Tested-by: Jenkins --- install_modules.sh | 8 +++++++- modules/openstack_project/manifests/template.pp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/install_modules.sh b/install_modules.sh index 1c5acc23e9..4fb7dd5fa6 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -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: diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index 5a341ec1bd..f1fa72fca8 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -19,7 +19,7 @@ class openstack_project::template ( rules6 => $iptables_rules6, } - class { 'ntp::server': } + class { 'ntp': } class { 'openstack_project::base': install_users => $install_users,