From 5825294dad7a3ff861c97d63242bfcf530a141da Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 1 Mar 2022 11:47:09 +0100 Subject: [PATCH] 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). --- internal/distro/rhel86/pipelines.go | 3 +-- internal/distro/rhel90/pipelines.go | 3 +-- test/data/manifests/centos_8-aarch64-image_installer-boot.json | 3 ++- test/data/manifests/centos_8-x86_64-image_installer-boot.json | 3 ++- test/data/manifests/centos_9-aarch64-image_installer-boot.json | 3 ++- test/data/manifests/centos_9-x86_64-image_installer-boot.json | 3 ++- test/data/manifests/rhel_86-aarch64-image_installer-boot.json | 3 ++- test/data/manifests/rhel_86-x86_64-image_installer-boot.json | 3 ++- test/data/manifests/rhel_90-aarch64-image_installer-boot.json | 3 ++- test/data/manifests/rhel_90-x86_64-image_installer-boot.json | 3 ++- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go index 12fc3ebc7..34b9e9fb0 100644 --- 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 index 496eb3fd7..3fbd04b72 100644 --- 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 index 1fb0b5b56..9dba3b302 100644 --- 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 index f7bbd1e21..a02f0d612 100644 --- 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 index fd425e542..d0a7ef9f2 100644 --- 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 index e45038d47..0db2f37b8 100644 --- 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 index c32d07f8e..8321859e7 100644 --- 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 index 8b01156e6..3182b05b1 100644 --- 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 index 66b6a58b3..d9360f649 100644 --- 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 index 4ea67939c..e2b29b88d 100644 --- 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" ] } },