manifest: add insights-client.service enable

Signed-off-by: Jonathan Holloway <[email protected]>

pkg/manifest/anaconda_installer_iso_tree.go

@@ -702,7 +702,9 @@ func (p *AnacondaInstallerISOTree) makeKickstartStages(stageOptions *osbuild.Kic
 
 		}
 		hardcodedKickstartBits += makeKickstartSubscriptionPost(subscriptionPath, systemPath)
-
+		if p.SubscriptionPipeline.Subscription != nil && p.SubscriptionPipeline.Subscription.Insights {
+			hardcodedKickstartBits += makeKickstartInsightsClientBootPost()
+		}
 		// include a readme file on the ISO in the subscription path to explain what it's for
 		subscriptionReadme, err := fsnode.NewFile(
 			filepath.Join(subscriptionPath, "README"),
@@ -780,3 +782,15 @@ systemctl enable osbuild-subscription-register.service
 `
 	return fmt.Sprintf(kickstartSubscriptionPost, fullSourcePath, dest)
 }
+
+func makeKickstartInsightsClientBootPost() string {
+	// Enabling the insights-client.service is necessary for the insights client to
+	// collect when a system is rebooted after an upgrade.
+	// It is facilitated via insights-client.service.d/override.conf
+	kickstartInsightsClientBootPost := `
+%post
+[ -e /etc/systemd/system/insights-client.service.d/override.conf ] && systemctl enable insights-client.service
+%end
+`
+	return kickstartInsightsClientBootPost
+}

pkg/manifest/anaconda_installer_iso_tree_test.go

@@ -768,3 +768,12 @@ func TestPayloadRemoveSignatures(t *testing.T) {
 		assert.Equal(t, tc.expected, skopeoStage.Options.(*osbuild.SkopeoStageOptions).RemoveSignatures)
 	}
 }
+
+func TestMakeKickstartInsightsClientBootPost(t *testing.T) {
+	exp := `
+%post
+[ -e /etc/systemd/system/insights-client.service.d/override.conf ] && systemctl enable insights-client.service
+%end
+`
+	assert.Equal(t, exp, makeKickstartInsightsClientBootPost())
+}

pkg/manifest/subscription.go

@@ -217,7 +217,7 @@ func runInsightsClientOnBoot() (*fsnode.Directory, *fsnode.File, error) {
 func insightsClientDropin() (string, string) {
 	return "/etc/systemd/system/insights-client.service.d/override.conf", `[Unit]
 Requisite=greenboot-healthcheck.service
-After=network-online.target greenboot-healthcheck.service osbuild-first-boot.service
+After=network-online.target greenboot-healthcheck.service osbuild-first-boot.service osbuild-subscription-register.service
 [Install]
 WantedBy=multi-user.target`
 }