From 01f91c2af46564e8bbfcb3fd305b1c8c0d4db93d Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: May 24 2021 12:44:04 +0000
Subject: Merge pull request #3315 from carlwgeorge/rhel-8_backport-3014


Add CentOS Stream config
---

diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf
new file mode 100644
index 0000000..723a484
--- /dev/null
+++ b/data/product.d/centos-stream.conf
@@ -0,0 +1,34 @@
+# Anaconda configuration file for CentOS Stream.
+
+[Product]
+product_name = CentOS Stream
+
+[Base Product]
+product_name = Red Hat Enterprise Linux
+
+[Anaconda]
+# List of enabled Anaconda DBus modules for RHEL.
+#  but without org.fedoraproject.Anaconda.Modules.Subscription
+kickstart_modules =
+    org.fedoraproject.Anaconda.Modules.Timezone
+    org.fedoraproject.Anaconda.Modules.Network
+    org.fedoraproject.Anaconda.Modules.Localization
+    org.fedoraproject.Anaconda.Modules.Security
+    org.fedoraproject.Anaconda.Modules.Users
+    org.fedoraproject.Anaconda.Modules.Payloads
+    org.fedoraproject.Anaconda.Modules.Storage
+    org.fedoraproject.Anaconda.Modules.Services
+
+[Bootloader]
+efi_dir = centos
+
+[User Interface]
+help_directory = /usr/share/anaconda/help/centos
+default_help_pages =
+    centos_help_placeholder.txt
+    centos_help_placeholder.xml
+    centos_help_placeholder.xml
+
+[Payload]
+enable_closest_mirror = True
+default_source = CLOSEST_MIRROR
diff --git a/data/product.d/centos.conf b/data/product.d/centos.conf
index 9490e03..dcf22c3 100644
--- a/data/product.d/centos.conf
+++ b/data/product.d/centos.conf
@@ -4,30 +4,4 @@
 product_name = CentOS Linux
 
 [Base Product]
-product_name = Red Hat Enterprise Linux
-
-[Anaconda]
-# List of enabled Anaconda DBus modules for RHEL.
-#  but without org.fedoraproject.Anaconda.Modules.Subscription
-kickstart_modules =
-     org.fedoraproject.Anaconda.Modules.Timezone
-     org.fedoraproject.Anaconda.Modules.Network
-     org.fedoraproject.Anaconda.Modules.Localization
-     org.fedoraproject.Anaconda.Modules.Security
-     org.fedoraproject.Anaconda.Modules.Users
-     org.fedoraproject.Anaconda.Modules.Payloads
-     org.fedoraproject.Anaconda.Modules.Storage
-     org.fedoraproject.Anaconda.Modules.Services
-
-[Bootloader]
-efi_dir = centos
-
-[User Interface]
-help_directory = /usr/share/anaconda/help/centos
-default_help_pages =
-    centos_help_placeholder.txt
-    centos_help_placeholder.xml
-    centos_help_placeholder.xml
-
-[Payload]
-default_source = CLOSEST_MIRROR
+product_name = CentOS Stream
diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py
index 55f3e0d..45d532b 100644
--- a/tests/nosetests/pyanaconda_tests/product_test.py
+++ b/tests/nosetests/pyanaconda_tests/product_test.py
@@ -240,8 +240,13 @@ class ProductConfigurationTestCase(unittest.TestCase):
             WORKSTATION_PARTITIONING
         )
         self._check_default_product(
+            "CentOS Stream", "",
+            ["rhel.conf", "centos-stream.conf"],
+            WORKSTATION_PARTITIONING
+        )
+        self._check_default_product(
             "CentOS Linux", "",
-            ["rhel.conf", "centos.conf"],
+            ["rhel.conf", "centos-stream.conf", "centos.conf"],
             WORKSTATION_PARTITIONING
         )
         self._check_default_product(
@@ -251,7 +256,7 @@ class ProductConfigurationTestCase(unittest.TestCase):
         )
         self._check_default_product(
             "oVirt Node Next", "",
-            ["rhel.conf", "centos.conf", "ovirt.conf"],
+            ["rhel.conf", "centos-stream.conf", "centos.conf", "ovirt.conf"],
             VIRTUALIZATION_PARTITIONING
         )
         self._check_default_product(