Merge pull request #9584 from andfasano/agent-ui-show-url

AGENT-467: show the agent ui url when available

Author: openshift-merge-bot[bot]

cmd/openshift-install/testdata/agent/unconfigured-ignition/configurations/interactive.txt

@@ -94,4 +94,6 @@ SERVICE_BASE_URL=http://{{.RendezvousIP}}:8090/
 IMAGE_SERVICE_BASE_URL=http://{{.RendezvousIP}}:8888/
 PULL_SECRET_TOKEN=
 USER_AUTH_TOKEN=
-WORKFLOW_TYPE=install-interactive-disconnected
+WORKFLOW_TYPE=install-interactive-disconnected
+AIUI_APP_API_URL=http://{{.RendezvousIP}}:8090/
+AIUI_URL=http://{{.RendezvousIP}}:3001/

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

@@ -2,15 +2,20 @@
 
 # shellcheck disable=SC1091
 source "issue_status.sh"
+source "/etc/assisted/rendezvous-host.env"
 
 inactive_services() {
-    local services="assisted-service.service agent-register-infraenv.service apply-host-config.service"
-    if [ ! -e "/etc/assisted/add-nodes.env" ]; then
-        # install workflow
-        services+=" agent-register-cluster.service start-cluster-installation.service"
-    else
+    local services="assisted-service.service"
+
+    if [ -f "/etc/assisted/interactive-ui" ]; then
+        # interactive workflow
+        services+=" agent-start-ui.service"
+    elif [ -f "/etc/assisted/add-nodes.env" ]; then
         # add nodes workflow
-        services+=" agent-import-cluster.service agent-add-node.service"
+        services+=" agent-import-cluster.service agent-register-infraenv.service apply-host-config.service agent-add-node.service"
+    else
+        # install workflow
+        services+=" agent-register-cluster.service agent-register-infraenv.service apply-host-config.service start-cluster-installation.service"
     fi
     for s in ${services}; do
         if ! systemctl is-active "${s}" >/dev/null; then
@@ -46,8 +51,18 @@ check_host_config() {
     fi
 }
 
+check_ui() {
+    local ui_issue="90_ui-availability"
+    if systemctl is-active --quiet "agent-start-ui"; then
+       echo "\e{green}Please go to \e{lightgreen}$AIUI_URL\e{reset}\e{green} in your browser to continue the installation\e{reset}" | set_issue "${ui_issue}"
+    else
+       clear_issue "${ui_issue}"        
+    fi
+}
+
 while true; do
     check_services
     check_host_config
+    check_ui
     sleep 5
 done

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

@@ -15,7 +15,7 @@ EnvironmentFile=/usr/local/share/assisted-service/agent-images.env
 EnvironmentFile=/etc/assisted/rendezvous-host.env
 ExecStartPre=/bin/rm -f %t/%n.ctr-id
 ExecStartPre=/usr/local/bin/wait-for-assisted-service.sh
-ExecStart=/bin/bash -c "AIUI_APP_API_URL=${SERVICE_BASE_URL} podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --restart=on-failure:10 --pod-id-file=%t/assisted-service-pod.pod-id --replace --name=agent-installer-ui --env AIUI_APP_API_URL $INSTALLER_UI_IMAGE"
+ExecStart=/usr/bin/podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --restart=on-failure:10 --pod-id-file=%t/assisted-service-pod.pod-id --replace -d --name=agent-installer-ui --env AIUI_APP_API_URL $INSTALLER_UI_IMAGE
 ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
 ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
 

data/data/agent/systemd/units/install-status.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Service that monitors host-specific configuration status
-Wants=network-online.target agent-register-infraenv.service
-After=network-online.target agent-register-infraenv.service
+Wants=network-online.target assisted-service-pod.service
+After=network-online.target assisted-service-pod.service
 ConditionPathExists=/etc/assisted/node0
 
 [Service]

pkg/asset/agent/image/ignition.go

@@ -464,13 +464,27 @@ func getRendezvousHostEnv(serviceProtocol, nodeZeroIP, agentAuthtoken, userAuthT
 	// and ensure successful authentication.
 	// In the absence of PULL_SECRET_TOKEN, the cluster installation will wait forever.
 
-	return fmt.Sprintf(`NODE_ZERO_IP=%s
+	rendezvousHostEnv := fmt.Sprintf(`NODE_ZERO_IP=%s
 SERVICE_BASE_URL=%s
 IMAGE_SERVICE_BASE_URL=%s
 PULL_SECRET_TOKEN=%s
 USER_AUTH_TOKEN=%s
 WORKFLOW_TYPE=%s
 `, nodeZeroIP, serviceBaseURL.String(), imageServiceBaseURL.String(), agentAuthtoken, userAuthToken, workflowType)
+
+	if workflowType == workflow.AgentWorkflowTypeInstallInteractiveDisconnected {
+		uiBaseURL := url.URL{
+			Scheme: serviceProtocol,
+			Host:   net.JoinHostPort(nodeZeroIP, "3001"),
+			Path:   "/",
+		}
+		uiEnv := fmt.Sprintf(`AIUI_APP_API_URL=%s
+AIUI_URL=%s
+`, serviceBaseURL.String(), uiBaseURL.String())
+		rendezvousHostEnv = fmt.Sprintf("%s%s", rendezvousHostEnv, uiEnv)
+	}
+
+	return rendezvousHostEnv
 }
 
 func getAddNodesEnv(clusterInfo joiner.ClusterInfo, authTokenExpiry string) string {