Merge pull request #9960 from zaneb/late-binding

AGENT-1303: Run agent-register-infraenv in interactive mode

Author: openshift-merge-bot[bot]

data/data/agent/files/usr/local/bin/install-status.sh

@@ -9,7 +9,7 @@ inactive_services() {
 
     if [ -f "/etc/assisted/interactive-ui" ]; then
         # interactive workflow
-        services+=" agent-ui.service"
+        services+=" agent-register-infraenv.service agent-ui.service"
     elif [ -f "/etc/assisted/add-nodes.env" ]; then
         # add nodes workflow
         services+=" agent-import-cluster.service agent-register-infraenv.service apply-host-config.service agent-add-node.service"

data/data/agent/systemd/units/agent-register-infraenv.service.template

@@ -4,7 +4,6 @@ Wants=network-online.target assisted-service.service
 PartOf=assisted-service-pod.service
 After=network-online.target assisted-service.service agent-register-cluster.service agent-import-cluster.service
 ConditionPathExists=/etc/assisted/node0
-ConditionPathExists=!/etc/assisted/interactive-ui
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
@@ -24,4 +23,4 @@ RestartSec=30
 RemainAfterExit=true
 
 [Install]
-WantedBy=start-cluster-installation.service agent-add-node.service
+WantedBy=start-cluster-installation.service agent-add-node.service agent-start-ui.service

data/data/agent/systemd/units/agent-ui.service.template

@@ -1,7 +1,7 @@
 [Unit]
 Description=Agent Installer Web UI
 Wants=network-online.target assisted-service.service
-After=network-online.target assisted-service.service
+After=network-online.target assisted-service.service agent-register-infraenv.service
 PartOf=assisted-service-pod.service
 ConditionPathExists=/etc/assisted/node0
 ConditionPathExists=/etc/assisted/interactive-ui