From c546c528a351ecfc3c426d69da78d96f77f0468d Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 23 Nov 2022 14:20:57 +0100 Subject: [PATCH] bootstrap: don't enable gatewayd socket on OKD FCOS doesn't come with this service, and now assisted installer fails attempting to enable this socket --- pkg/asset/ignition/bootstrap/common.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go index ec393f04532..de21c4ad0ea 100644 --- a/pkg/asset/ignition/bootstrap/common.go +++ b/pkg/asset/ignition/bootstrap/common.go @@ -50,8 +50,6 @@ var ( commonEnabledServices = []string{ "progress.service", "kubelet.service", - "chown-gatewayd-key.service", - "systemd-journal-gatewayd.socket", "approve-csr.service", // baremetal & openstack platform services "keepalived.service", @@ -59,6 +57,10 @@ var ( "ironic.service", "master-bmh-update.service", } + ocpEnabledServices = []string{ + "chown-gatewayd-key.service", + "systemd-journal-gatewayd.socket", + } ) // bootstrapTemplateData is the data to use to replace values in bootstrap @@ -176,6 +178,11 @@ func (a *Common) generateConfig(dependencies asset.Parents, templateData *bootst if err := AddSystemdUnits(a.Config, "bootstrap/systemd/units", templateData, commonEnabledServices); err != nil { return err } + if !templateData.IsOKD { + if err := AddSystemdUnits(a.Config, "bootstrap/systemd/units", templateData, ocpEnabledServices); err != nil { + return err + } + } // Check for optional platform specific files/units platform := installConfig.Config.Platform.Name()