AGENT-615: Split create-cluster-and-infraenv.service

The service has been removed and split into agent-register-cluster.service agent-register-infraenv.service Both services continuously retries until their respective resource has been registered with the assisted-service REST-API or if the client sees that a resource as already been registered. Requires: openshift/assisted-service#5376 Signed-off-by: Richard Su <rwsu@redhat.com>
rwsu · Oct 20, 2023 · b48cf4a · b48cf4a
1 parent 3c3f41c
commit b48cf4a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 10 deletions.
diff --git a/data/data/agent/files/usr/local/bin/install-status.sh b/data/data/agent/files/usr/local/bin/install-status.sh
@@ -4,7 +4,7 @@
 source "issue_status.sh"
 
 inactive_services() {
-    local services="assisted-service.service create-cluster-and-infraenv.service apply-host-config.service start-cluster-installation.service"
+    local services="assisted-service.service agent-register-cluster.service agent-register-infraenv.service apply-host-config.service start-cluster-installation.service"
     for s in ${services}; do
         if ! systemctl is-active "${s}" >/dev/null; then
             printf "%s " "${s}"

diff --git a/data/data/agent/files/usr/local/bin/set-node-zero.sh b/data/data/agent/files/usr/local/bin/set-node-zero.sh
@@ -67,7 +67,8 @@ if [ "${IS_NODE_ZERO}" = "true" ]; then
 # definitions:
 # apply-host-config.service
 # assisted-service-pod.service
-# create-cluster-and-infraenv.service
+# agent-register-cluster.service
+# agent-register-infraenv.service
 # install-status.service
 # start-cluster-installation.service
 BOOTSTRAP_HOST_MAC=${NODE_ZERO_MAC}

diff --git a/...ate-cluster-and-infraenv.service.template → ...s/agent-register-cluster.service.template b/...ate-cluster-and-infraenv.service.template → ...s/agent-register-cluster.service.template
@@ -1,5 +1,5 @@
 [Unit]
-Description=Service that creates initial cluster and infraenv
+Description=Service that registers the cluster
 Wants=network-online.target assisted-service.service
 PartOf=assisted-service-pod.service
 After=network-online.target assisted-service.service
@@ -8,18 +8,19 @@ ConditionPathExists=/etc/assisted/node0
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 Environment=OPENSHIFT_INSTALL_RELEASE_IMAGE_MIRROR={{.ReleaseImageMirror}}
-Environment=IMAGE_TYPE_ISO={{.ImageTypeISO}}
 EnvironmentFile=/etc/assisted/rendezvous-host.env
 EnvironmentFile=/usr/local/share/assisted-service/agent-images.env
 EnvironmentFile=/usr/local/share/assisted-service/assisted-service.env
 ExecStartPre=/bin/rm -f %t/%n.ctr-id
 ExecStartPre=/usr/local/bin/wait-for-assisted-service.sh
-ExecStart=podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --rm --pod-id-file=%t/assisted-service-pod.pod-id --replace --name=create-cluster-and-infraenv --restart=on-failure -v /etc/assisted/manifests:/manifests -v /etc/assisted/extra-manifests:/extra-manifests -v /etc/pki/ca-trust:/etc/pki/ca-trust:z {{ if .HaveMirrorConfig }}-v /etc/containers:/etc/containers{{ end }} --env SERVICE_BASE_URL --env OPENSHIFT_INSTALL_RELEASE_IMAGE_MIRROR  --env IMAGE_TYPE_ISO $SERVICE_IMAGE /usr/local/bin/agent-installer-client register
+ExecStart=podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --rm --pod-id-file=%t/assisted-service-pod.pod-id --replace --name=agent-register-cluster -v /etc/assisted/manifests:/manifests -v /etc/assisted/extra-manifests:/extra-manifests -v /etc/pki/ca-trust:/etc/pki/ca-trust:z {{ if .HaveMirrorConfig }}-v /etc/containers:/etc/containers{{ end }} --env SERVICE_BASE_URL --env OPENSHIFT_INSTALL_RELEASE_IMAGE_MIRROR $SERVICE_IMAGE /usr/local/bin/agent-installer-client registerCluster
 ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
 ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
 
 KillMode=none
 Type=oneshot
+Restart=on-failure
+RestartSec=30
 RemainAfterExit=true
 
 [Install]

diff --git a/data/data/agent/systemd/units/agent-register-infraenv.service.template b/data/data/agent/systemd/units/agent-register-infraenv.service.template
@@ -0,0 +1,26 @@
+[Unit]
+Description=Service that registers the infraenv
+Wants=network-online.target assisted-service.service
+PartOf=assisted-service-pod.service
+After=network-online.target assisted-service.service agent-register-cluster.service
+ConditionPathExists=/etc/assisted/node0
+
+[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
+Environment=IMAGE_TYPE_ISO={{.ImageTypeISO}}
+EnvironmentFile=/etc/assisted/rendezvous-host.env
+EnvironmentFile=/usr/local/share/assisted-service/agent-images.env
+EnvironmentFile=/usr/local/share/assisted-service/assisted-service.env
+ExecStartPre=/bin/rm -f %t/%n.ctr-id
+ExecStart=podman run --net host --cidfile=%t/%n.ctr-id --cgroups=no-conmon --log-driver=journald --rm --pod-id-file=%t/assisted-service-pod.pod-id --replace --name=agent-register-infraenv -v /etc/assisted/manifests:/manifests --env SERVICE_BASE_URL --env IMAGE_TYPE_ISO $SERVICE_IMAGE /usr/local/bin/agent-installer-client registerInfraEnv
+ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
+ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
+
+KillMode=none
+Type=oneshot
+Restart=on-failure
+RestartSec=30
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/data/data/agent/systemd/units/apply-host-config.service b/data/data/agent/systemd/units/apply-host-config.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Service that applies host-specific configuration
 Wants=network-online.target
-Requires=create-cluster-and-infraenv.service
+Requires=agent-register-infraenv.service
 PartOf=assisted-service-pod.service
-After=network-online.target create-cluster-and-infraenv.service
+After=network-online.target agent-register-infraenv.service
 ConditionPathExists=/etc/assisted/node0
 
 [Service]

diff --git a/data/data/agent/systemd/units/install-status.service b/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 create-cluster-and-infraenv.service
-After=network-online.target create-cluster-and-infraenv.service
+Wants=network-online.target agent-register-infraenv.service
+After=network-online.target agent-register-infraenv.service
 ConditionPathExists=/etc/assisted/node0
 
 [Service]

diff --git a/pkg/asset/agent/image/ignition.go b/pkg/asset/agent/image/ignition.go
@@ -249,11 +249,12 @@ func getDefaultEnabledServices() []string {
 	return []string{
 		"agent-interactive-console.service",
 		"agent-interactive-console-serial@.service",
+		"agent-register-infraenv.service",
+		"agent-register-cluster.service",
 		"agent.service",
 		"assisted-service-db.service",
 		"assisted-service-pod.service",
 		"assisted-service.service",
-		"create-cluster-and-infraenv.service",
 		"node-zero.service",
 		"multipathd.service",
 		"selinux.service",