diff --git a/data/data/agent/files/usr/local/bin/install-status.sh b/data/data/agent/files/usr/local/bin/install-status.sh index 12c2892b793..3acedfd6076 100644 --- a/data/data/agent/files/usr/local/bin/install-status.sh +++ b/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" diff --git a/data/data/agent/systemd/units/agent-register-infraenv.service.template b/data/data/agent/systemd/units/agent-register-infraenv.service.template index 2bfd108cf8c..027aff4a585 100644 --- a/data/data/agent/systemd/units/agent-register-infraenv.service.template +++ b/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 diff --git a/data/data/agent/systemd/units/agent-ui.service.template b/data/data/agent/systemd/units/agent-ui.service.template index 1b33ed7f027..325418132c7 100644 --- a/data/data/agent/systemd/units/agent-ui.service.template +++ b/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 diff --git a/docs/user/agent/agent_installer_services-interactive.svg b/docs/user/agent/agent_installer_services-interactive.svg index e766db84173..5e584049833 100644 --- a/docs/user/agent/agent_installer_services-interactive.svg +++ b/docs/user/agent/agent_installer_services-interactive.svg @@ -4,301 +4,310 @@ - - + + agent_installer_services_interactive_workflow - + cluster_assisted_service_pod - + agent_extract_tui - -agent-extract-tui + +agent-extract-tui - + _usr_local_bin_agent_tui - - - -/usr/local/bin/agent-tui + + + +/usr/local/bin/agent-tui agent_extract_tui->_usr_local_bin_agent_tui - - + + - + agent_interactive_console_serial - -agent-interactive-console-serial@ + +agent-interactive-console-serial@ - + agent_extract_tui->agent_interactive_console_serial - - + + - + agent_interactive_console - -agent-interactive-console + +agent-interactive-console - + agent_extract_tui->agent_interactive_console - - + + iscsiadm - -iscsiadm + +iscsiadm iscsistart - -iscsistart + +iscsistart - + iscsistart->iscsiadm - - + + pre_network_manager_config - -pre-network-manager-config + +pre-network-manager-config - + pre_network_manager_config->agent_interactive_console_serial - - + + - + pre_network_manager_config->agent_interactive_console - - + + selinux - -selinux + +selinux selinux->agent_extract_tui - - + + - + selinux->agent_interactive_console_serial - - + + - + selinux->agent_interactive_console - - + + set_hostname - -set-hostname + +set-hostname - + set_hostname->agent_interactive_console - - + + - + agent - -agent + +agent - + set_hostname->agent - - + + _etc_assisted_node0 - - - -/etc/assisted/node0 + + + +/etc/assisted/node0 - + install_status - -install-status + +install-status - + _etc_assisted_node0->install_status - - + + - + assisted_service_pod - -assisted-service-pod + +assisted-service-pod - + _etc_assisted_node0->assisted_service_pod - - + + - - -agent_start_ui - -agent-start-ui + + +agent_register_infraenv + +agent-register-infraenv - - -_etc_assisted_node0->agent_start_ui - - + + +_etc_assisted_node0->agent_register_infraenv + + - - -_etc_assisted_rendezvous_host_env - - - -/etc/assisted/ -rendezvous-host.env - - - -_etc_assisted_rendezvous_host_env->agent_extract_tui - - + + +agent_ui + +agent-ui + + + +_etc_assisted_node0->agent_ui + + - + _usr_local_bin_agent_tui->agent_interactive_console_serial - - + + - + _usr_local_bin_agent_tui->agent_interactive_console - - + + - + agent_interactive_console_serial->agent - - + + - + node_zero - -node-zero + +node-zero - + agent_interactive_console_serial->node_zero - - + + - + agent_interactive_console->agent - - + + - + agent_interactive_console->node_zero - - + + node_zero->_etc_assisted_node0 - - + + - + node_zero->assisted_service_pod - - + + - + oci_eval_user_data - -oci-eval-user-data + +oci-eval-user-data - + assisted_service_pod->install_status - - + + - + + assisted_service_db - -assisted-service-db + +assisted-service-db - - + assisted_service_pod->assisted_service_db - - + + assisted_service - -assisted-service + +assisted-service - + assisted_service_pod->assisted_service - - + + - - -assisted_service->agent_start_ui - - + + +agent_register_infraenv->agent_ui + + + + + +assisted_service->agent_register_infraenv + + + + + +assisted_service->agent_ui + +