From 8dbccff85137d7f84d7b263d00db70a121ebc1b0 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 2 Sep 2026 15:13:18 +1200 Subject: [PATCH] OCPBUGS-115550: use different INSTALL_INVOKER for unconfigured ignition The INSTALL_INVOKER environment variable in assisted-service is now set to agent-installer-postconfig when the agent unconfigured-ignition workflow is used, distinguishing it from the regular agent-installer workflow. This will show up in installations using the appliance or the OVE installer. Assisted-by: Claude Code --- .../local/share/assisted-service/assisted-service.env.template | 2 +- pkg/asset/agent/image/ignition.go | 2 ++ pkg/asset/agent/image/unconfigured_ignition.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template b/data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template index 06864358fc5..310bb80333c 100644 --- a/data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template +++ b/data/data/agent/files/usr/local/share/assisted-service/assisted-service.env.template @@ -10,7 +10,7 @@ DUMMY_IGNITION=false ENABLE_SINGLE_NODE_DNSMASQ=true EPHEMERAL_INSTALLER_CLUSTER_TLS_CERTS_OVERRIDE_DIR=/opt/agent/tls HW_VALIDATOR_REQUIREMENTS=TO_BE_REPLACED_BY_SYSTEMD -INSTALL_INVOKER=agent-installer +INSTALL_INVOKER=agent-installer{{.InstallInvokerSuffix}} IPV6_SUPPORT=true TNA_CLUSTERS_SUPPORT=true TNF_CLUSTERS_SUPPORT=true diff --git a/pkg/asset/agent/image/ignition.go b/pkg/asset/agent/image/ignition.go index 4ad373d5790..a2edefcf39e 100644 --- a/pkg/asset/agent/image/ignition.go +++ b/pkg/asset/agent/image/ignition.go @@ -90,6 +90,8 @@ type agentTemplateData struct { // DisabledHostValidations is a comma-separated list of assisted-service host // validation IDs to disable. Set only for the add-nodes workflow. DisabledHostValidations string + // InstallInvokerSuffix is appended to "agent-installer" for INSTALL_INVOKER. + InstallInvokerSuffix string } // Name returns the human-friendly name of the asset. diff --git a/pkg/asset/agent/image/unconfigured_ignition.go b/pkg/asset/agent/image/unconfigured_ignition.go index 3b08c40ec32..c40e5971153 100644 --- a/pkg/asset/agent/image/unconfigured_ignition.go +++ b/pkg/asset/agent/image/unconfigured_ignition.go @@ -180,6 +180,7 @@ func (a *UnconfiguredIgnition) Generate(ctx context.Context, dependencies asset. WatcherAuthToken: authConfig.WatcherAuthToken, AuthType: authConfig.AuthType, DisableImagePolicy: shouldDisableImagePolicy(), + InstallInvokerSuffix: "-postconfig", } enabledServices := getDefaultEnabledServices()