Merge pull request #9186 from hakman/automated-cherry-pick-of-#9182-u…

…pstream-release-1.16 Automated cherry pick of #9182: Use systemd-timesyncd for Ubuntu 20.04
kubernetes · May 28, 2020 · bed56d9 · bed56d9
2 parents c67d14f + 4865869
commit bed56d9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go
@@ -46,7 +46,10 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error {
 		return nil
 	}
 
-	if b.Distribution.IsDebianFamily() {
+	if b.Distribution == distros.DistributionFocal {
+		c.AddTask(&nodetasks.Package{Name: "systemd-timesyncd"})
+		c.AddTask((&nodetasks.Service{Name: "systemd-timesyncd"}).InitDefaults())
+	} else if b.Distribution.IsDebianFamily() {
 		c.AddTask(&nodetasks.Package{Name: "ntp"})
 		c.AddTask((&nodetasks.Service{Name: "ntp"}).InitDefaults())
 	} else if b.Distribution.IsRHELFamily() {