Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow deployment on Centos 6.5 environment
[genesis.git]
/
fuel
/
build
/
f_ntp
/
puppet
/
modules
/
opnfv
/
manifests
/
ntp.pp
diff --git
a/fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
b/fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
index
8180e3d
..
c5dce1b
100644
(file)
--- a/
fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
+++ b/
fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
@@
-31,6
+31,15
@@
class opnfv::ntp(
$file='/etc/ntp.conf'
) {
$file='/etc/ntp.conf'
) {
+ case $::operatingsystem {
+ centos, redhat: {
+ $service_name = 'ntpd'
+ }
+ debian, ubuntu: {
+ $service_name = 'ntp'
+ }
+ }
+
if $::fuel_settings['role'] {
if ($::fuel_settings['opnfv'] and
$::fuel_settings['opnfv']['ntp']) {
if $::fuel_settings['role'] {
if ($::fuel_settings['opnfv'] and
$::fuel_settings['opnfv']['ntp']) {
@@
-63,9
+72,9
@@
class opnfv::ntp(
service { 'ntp':
ensure => running,
service { 'ntp':
ensure => running,
+ name => $service_name,
enable => true,
require => [ Package['ntp'], File[$file]]
}
}
}
enable => true,
require => [ Package['ntp'], File[$file]]
}
}
}
-