Browse Source

Merge "Remove ntpdate references"

changes/00/791900/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
db12489a6c
1 changed files with 2 additions and 15 deletions
  1. +2
    -15
      packstack/puppet/modules/packstack/manifests/chrony.pp

+ 2
- 15
packstack/puppet/modules/packstack/manifests/chrony.pp View File

@ -54,11 +54,6 @@ class packstack::chrony ()
name => 'chrony',
}
package { 'ntpdate':
ensure => 'installed',
name => 'ntpdate',
}
file { 'chrony_conf':
ensure => file,
path => '/etc/chrony.conf',
@ -72,14 +67,8 @@ class packstack::chrony ()
onlyif => 'systemctl status chronyd.service'
}
# for cases where ntpd is running instead of default chronyd
service { 'ntpd':
ensure => stopped,
enable => false,
}
exec { 'ntpdate':
command => "/usr/sbin/ntpdate ${cfg_ntp_servers}",
command => "/usr/bin/chronyc makestep",
tries => 3,
}
@ -92,10 +81,8 @@ class packstack::chrony ()
}
Package['chrony']
-> Package['ntpdate']
-> File['chrony_conf']
-> Exec['stop-chronyd']
-> Service['ntpd']
-> Exec['ntpdate']
-> Service['chronyd']
-> Exec['ntpdate']
}

Loading…
Cancel
Save