From 87f9f77e24f3c11314129a63537478650bf6c7a8 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 3 Nov 2021 14:35:58 -0700
Subject: [PATCH] Move default releasever into pylorax DEFAULT_RELEASEVER

This makes it easier to update in one place, and hopefully not forget
for new releases.

Also update default platform id to f36.
---
 src/pylorax/__init__.py | 3 ++-
 src/pylorax/cmdline.py  | 4 ++--
 src/pylorax/creator.py  | 6 +++---
 src/pylorax/dnfbase.py  | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 9060c130..c293aef2 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -61,7 +61,8 @@ else:
 DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", "--add", "fips"]
 
 # Used for DNF conf.module_platform_id
-DEFAULT_PLATFORM_ID = "platform:f34"
+DEFAULT_PLATFORM_ID = "platform:f36"
+DEFAULT_RELEASEVER = "36"
 
 class ArchData(DataHolder):
     lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64")
diff --git a/src/pylorax/cmdline.py b/src/pylorax/cmdline.py
index 50dab743..cc3928d7 100644
--- a/src/pylorax/cmdline.py
+++ b/src/pylorax/cmdline.py
@@ -22,7 +22,7 @@ import os
 import sys
 import argparse
 
-from pylorax import vernum
+from pylorax import DEFAULT_RELEASEVER, vernum
 
 version = "{0}-{1}".format(os.path.basename(sys.argv[0]), vernum)
 
@@ -306,7 +306,7 @@ def lmc_parser(dracut_default=""):
 
     parser.add_argument("--project", default="Linux",
                         help="substituted for @PROJECT@ in bootloader config files")
-    parser.add_argument("--releasever", default="34",
+    parser.add_argument("--releasever", default=DEFAULT_RELEASEVER,
                         help="substituted for @VERSION@ in bootloader config files")
     parser.add_argument("--volid", default=None, help="volume id")
     parser.add_argument("--squashfs-only", action="store_true", default=False,
diff --git a/src/pylorax/creator.py b/src/pylorax/creator.py
index c510b100..a66e6906 100644
--- a/src/pylorax/creator.py
+++ b/src/pylorax/creator.py
@@ -34,7 +34,7 @@ from pykickstart.constants import KS_SHUTDOWN
 from pykickstart.version import makeVersion
 
 # Use the Lorax treebuilder branch for iso creation
-from pylorax import ArchData
+from pylorax import DEFAULT_RELEASEVER, ArchData
 from pylorax.base import DataHolder
 from pylorax.executils import execWithRedirect
 from pylorax.imgutils import DracutChroot, PartitionMount
@@ -149,7 +149,7 @@ def dracut_args(opts):
 
 def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
                    vcpus=1, arch=None, title="Linux", project="Linux",
-                   releasever="34"):
+                   releasever=DEFAULT_RELEASEVER):
     """
     Generate an appliance description file
 
@@ -163,7 +163,7 @@ def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
     :param str arch: CPU architecture. Default is 'x86_64'
     :param str title: Title, passed to template. Default is 'Linux'
     :param str project: Project, passed to template. Default is 'Linux'
-    :param str releasever: Release version, passed to template. Default is 34
+    :param str releasever: Release version, passed to template.
     """
     if not (disk_img and template and outfile):
         return None
diff --git a/src/pylorax/dnfbase.py b/src/pylorax/dnfbase.py
index a0ba7d72..dc82c634 100644
--- a/src/pylorax/dnfbase.py
+++ b/src/pylorax/dnfbase.py
@@ -20,12 +20,12 @@ import dnf
 import os
 import shutil
 
-from pylorax import DEFAULT_PLATFORM_ID
+from pylorax import DEFAULT_PLATFORM_ID, DEFAULT_RELEASEVER
 from pylorax.sysutils import flatconfig
 
 def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None,
                         enablerepos=None, disablerepos=None,
-                        tempdir="/var/tmp", proxy=None, releasever="34",
+                        tempdir="/var/tmp", proxy=None, releasever=DEFAULT_RELEASEVER,
                         cachedir=None, logdir=None, sslverify=True, dnfplugins=None):
     """ Create a dnf Base object and setup the repositories and installroot