distro/rhel86+90: enable the anaconda user modeule for image-installer

Enable the user module unconditionally for the image-installer: - If users are specified for the kickstart file, the module is required to set up the users. - If no users are specified, the module can be used at install time to create users. Updated relevant test cases (manifests).
osbuild · Mar 1, 2022 · 169eaab · 169eaab
1 parent e41867c
commit 169eaab
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go
@@ -257,8 +257,7 @@ func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizati
 	}
 	archName := t.arch.name
 	d := t.arch.distro
-	ksUsers := len(customizations.GetUsers())+len(customizations.GetGroups()) > 0
-	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", ksUsers))
+	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", true))
 	isolabel := fmt.Sprintf(d.isolabelTmpl, archName)
 	pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages))
 	pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64"))

diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
@@ -249,8 +249,7 @@ func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizati
 	}
 	archName := t.arch.name
 	d := t.arch.distro
-	ksUsers := len(customizations.GetUsers())+len(customizations.GetGroups()) > 0
-	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", ksUsers))
+	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", true))
 	isolabel := fmt.Sprintf(d.isolabelTmpl, archName)
 	pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages))
 	pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64"))

diff --git a/test/data/manifests/centos_8-aarch64-image_installer-boot.json b/test/data/manifests/centos_8-aarch64-image_installer-boot.json
@@ -1891,7 +1891,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/centos_8-x86_64-image_installer-boot.json b/test/data/manifests/centos_8-x86_64-image_installer-boot.json
@@ -1920,7 +1920,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/centos_9-aarch64-image_installer-boot.json b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -1849,7 +1849,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/centos_9-x86_64-image_installer-boot.json b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
@@ -1885,7 +1885,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json b/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
@@ -1924,7 +1924,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json b/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
@@ -1956,7 +1956,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -1872,7 +1872,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },

diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
@@ -1902,7 +1902,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },