Merge pull request #9356 from bfournie/iscsi-installation

OCPBUGS-48256: Run iscsiadm for agent-based iSCSI installations
openshift · Jan 17, 2025 · 5981419 · 5981419
2 parents 4fd9f0f + 4cebd5d
commit 5981419
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/data/data/agent/systemd/units/iscsiadm.service b/data/data/agent/systemd/units/iscsiadm.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ensure iscsid is started and iSCSI sessions are managed 
+After=iscsistart.service
+
+[Service]
+Type=oneshot
+ExecStart=-/usr/sbin/iscsiadm -m session -P3
+
+[Install]
+WantedBy=multi-user.target
diff --git a/docs/user/agent/agent-services.md b/docs/user/agent/agent-services.md
@@ -22,6 +22,8 @@ step is required because the agent-tui and nmstate libraries are too big to fit
 * install-status - determines the current install status and writes it out to /etc/issue.d/
 * apply-host-config - applies root device hints and roles specified in agent-config.yaml
 * start-cluster-installation - calls assisted-service REST-API to start cluster installation when all hosts are in ready state and have passed validations
+* iscsistart - calls the iscsistart utility which allows an iSCSI session to be started for booting off an iSCSI target
+* iscsiadm - calls the iscsiadm utility that will start iscsid to manage the iSCSI session needed to install the final rhcos image
 
 ## Add-nodes workflow
 
@@ -47,4 +49,4 @@ agent-interactive-console service because the disk images generated in the facto
 so no connectivity checks to the release image is needed.
 
 * load-config-iso@ - detects the config image has been mounted and copies the cluster configuration files from the config image to the host. It also enables start-cluster-installation which is disabled by default in the unconfigured-ignition. The actual service is created when the config image is mounted as a device and its name will be load-config-iso@<dev-name>.service e.g [email protected]
-* agent-check-config-image - if the config image has not been mounted, it displays a message to the console asking for the config image to be mounted in order to start the cluster installation.
+* agent-check-config-image - if the config image has not been mounted, it displays a message to the console asking for the config image to be mounted in order to start the cluster installation.
diff --git a/docs/user/agent/agent_installer_services-install_workflow.png b/docs/user/agent/agent_installer_services-install_workflow.png
diff --git a/pkg/asset/agent/image/ignition.go b/pkg/asset/agent/image/ignition.go
@@ -382,6 +382,7 @@ func getDefaultEnabledServices() []string {
 		"oci-eval-user-data.service",
 		"iscsistart.service",
 		"set-hostname.service",
+		"iscsiadm.service",
 	}
 }