network-installer: Do not set timezone or locale in Kickstart

pkg/distro/generic/images.go

@@ -1310,34 +1310,10 @@ func networkInstallerImage(t *imageType,
 
 	var err error
 	img.Kickstart, err = kickstart.New(customizations)
-
 	if err != nil {
 		return nil, err
 	}
-
-	// So this is slightly funky. Normally we set these kickstart options based on the
-	// OSCustomizations. I've explicitly chosen not to do that because the values in
-	// OSCustomizations can come either from the image config *or* from the blueprint.
-	// Since OSCustomizations *always* contains values we cannot determine based on it
-	// if we want a kickstart or not.
-
-	// With the duplication below we only add a kickstart if the user actually provided
-	// values through the blueprint instead of always.
-	language, keyboard := customizations.GetPrimaryLocale()
-
-	if language != nil {
-		img.Language = *language
-		img.Kickstart.Language = language
-	}
-
-	if keyboard != nil {
-		img.Kickstart.Keyboard = keyboard
-	}
-
-	timezone, _ := customizations.GetTimezoneSettings()
-	if timezone != nil {
-		img.Kickstart.Timezone = timezone
-	}
+	// NOTE: The network installer only supports adding users and groups
 
 	// If we have an empty kickstart options we don't want to put it on
 	// the image at all as an empty kickstart will create an empty kickstart
@@ -1346,6 +1322,12 @@ func networkInstallerImage(t *imageType,
 		img.Kickstart = nil
 	}
 
+	language, _ := customizations.GetPrimaryLocale()
+
+	if language != nil {
+		img.Language = *language
+	}
+
 	img.ExtraBasePackages = packageSets[installerPkgsKey]
 
 	img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations, options)

test/config-list.json

@@ -805,5 +805,31 @@
         "generic-ami"
       ]
     }
+  },
+  {
+    "path": "./configs/locale.json",
+    "filters": {
+      "distros": [
+        "rhel-10*",
+        "rhel-9*",
+        "rhel-8*",
+        "centos*"
+      ],
+      "image-types": [
+          "network-installer"
+      ]
+    }
+  },
+  {
+    "path": "./configs/locale.json",
+    "filters": {
+      "distros": [
+        "fedora*"
+      ],
+      "image-types": [
+          "everything-network-installer",
+          "server-network-installer"
+      ]
+    }
   }
 ]

test/configs/locale.json

@@ -0,0 +1,15 @@
+{
+  "name": "locale",
+  "blueprint": {
+    "name": "locale",
+    "description": "Locale only to test network installers",
+    "version": "1.0",
+    "customizations": {
+      "locale": {
+        "languages": [
+          "en_US.UTF-8"
+        ]
+      }
+    }
+  }
+}