Skip to content

Commit

Permalink
bootstrap: don't enable gatewayd socket on OKD
Browse files Browse the repository at this point in the history
FCOS doesn't come with this service, and now assisted installer fails attempting to enable this socket
  • Loading branch information
vrutkovs authored and JM1 committed Sep 17, 2023
1 parent 7f49fee commit c546c52
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkg/asset/ignition/bootstrap/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,17 @@ var (
commonEnabledServices = []string{
"progress.service",
"kubelet.service",
"chown-gatewayd-key.service",
"systemd-journal-gatewayd.socket",
"approve-csr.service",
// baremetal & openstack platform services
"keepalived.service",
"coredns.service",
"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
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit c546c52

Please sign in to comment.