AGENT-905: Start agent-add-node.service in appliance

openshift · Apr 26, 2024 · 6ec2525 · 6ec2525
1 parent 915879e
commit 6ec2525
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/data/data/agent/files/usr/local/bin/load-config-iso.sh b/data/data/agent/files/usr/local/bin/load-config-iso.sh
@@ -76,6 +76,9 @@ copy_archive_contents() {
 
     # Start the service which does the installation
     local installation_service="start-cluster-installation.service"
+    if cpio -tc <"${unzipped_file}" | grep -q '^/etc/assisted/workflow/add-nodes\.env$'; then
+        installation_service="agent-add-node.service"
+    fi
     is_enabled=$(systemctl is-enabled "$installation_service")
     if [[ "${is_enabled}" == "disabled" ]]; then
        echo "Service ${installation_service} is disabled, starting it"

diff --git a/pkg/asset/agent/image/unconfigured_ignition.go b/pkg/asset/agent/image/unconfigured_ignition.go
@@ -37,6 +37,7 @@ func GetConfigImageFiles() []string {
 		"/etc/assisted/hostconfig",      // all files in directory
 		"/etc/assisted/hostnames",       // all files in directory
 		"/etc/assisted/network",         // all files in directory
+		"/etc/assisted/workflow",        // all files in directory
 		"/etc/NetworkManager/conf.d/clientid.conf",
 		"/etc/issue",
 		"/etc/systemd/system.conf.d/10-default-env.conf",