diff --git a/mantle/kola/tests/misc/users.go b/mantle/kola/tests/misc/users.go index 96a103e243..8f2f66aea2 100644 --- a/mantle/kola/tests/misc/users.go +++ b/mantle/kola/tests/misc/users.go @@ -36,12 +36,10 @@ func CheckUserShells(c cluster.TestCluster) { var badusers []string ValidUsers := map[string]string{ - "sync": "/bin/sync", - "shutdown": "/sbin/shutdown", - "halt": "/sbin/halt", - "core": "/bin/bash", - "fedora-coreos-pinger": "/usr/sbin/nologin", - "zincati": "/usr/sbin/nologin", + "sync": "/bin/sync", + "shutdown": "/sbin/shutdown", + "halt": "/sbin/halt", + "core": "/bin/bash", } output := c.MustSSH(m, "getent passwd") diff --git a/mantle/platform/cluster.go b/mantle/platform/cluster.go index 53f749c029..9d7bf80413 100644 --- a/mantle/platform/cluster.go +++ b/mantle/platform/cluster.go @@ -207,10 +207,8 @@ func (bc *BaseCluster) RenderUserData(userdata *platformConf.UserData, ignitionV conf.CopyKeys(keys) } - // disable Zincati & Pinger by default + // disable Zincati by default if bc.Distribution() == "fcos" { - conf.AddFile("/etc/fedora-coreos-pinger/config.d/90-disable-reporting.toml", `[reporting] -enabled = false`, 0644) conf.AddFile("/etc/zincati/config.d/90-disable-auto-updates.toml", `[updates] enabled = false`, 0644) }