From 8184c9d7f77385d57720062c64fc36d9f228e533 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 17 Nov 2023 17:51:45 +0100 Subject: [PATCH] Making kiskstart meta RHEL9_REPOSERVER_URL depending, whether the current distro is RHEL --- lib/cr_vmware_tpl/cobbler/profile.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/cr_vmware_tpl/cobbler/profile.py b/lib/cr_vmware_tpl/cobbler/profile.py index cfc2809..b742c77 100644 --- a/lib/cr_vmware_tpl/cobbler/profile.py +++ b/lib/cr_vmware_tpl/cobbler/profile.py @@ -27,7 +27,7 @@ from .. import print_section_start, print_section_end from ..errors import ExpectedCobblerError from ..xlate import XLATOR -__version__ = '0.2.0' +__version__ = '0.2.1' LOG = logging.getLogger(__name__) @@ -257,7 +257,8 @@ class CobblerProfile(): ks_meta_list.append("SYSTEM_STATUS={}".format(status)) ks_meta_list.append("WS_REL_FILESDIR={}".format(self.cfg.cobbler_ws_rel_filesdir)) ks_meta_list.append("COBBLER_URL=http://{}".format(self.cfg.cobbler_host)) - ks_meta_list.append("RHEL9_REPOSERVER_URL={}".format(self.cfg.rhel9_repo_server_url) + if self.current_distro.is_rhel: + ks_meta_list.append("RHEL9_REPOSERVER_URL={}".format(self.cfg.rhel9_repo_server_url) ks_meta = ' '.join(ks_meta_list) @@ -304,10 +305,11 @@ class CobblerProfile(): LOG.debug(_('Profile ks_meta {!r} is not ok.').format('COBBLER_URL')) ks_meta_ok = False - if 'RHEL9_REPOSERVER_URL' not in ks_meta_vars or \ - ks_meta_vars['RHEL9_REPOSERVER_URL'] != self.cfg.rhel9_repo_server_url: - LOG.debug(_('Profile ks_meta {!r} is not ok.').format('RHEL9_REPOSERVER_URL')) - ks_meta_ok = False + if self.current_distro.is_rhel: + if 'RHEL9_REPOSERVER_URL' not in ks_meta_vars or \ + ks_meta_vars['RHEL9_REPOSERVER_URL'] != self.cfg.rhel9_repo_server_url: + LOG.debug(_('Profile ks_meta {!r} is not ok.').format('RHEL9_REPOSERVER_URL')) + ks_meta_ok = False return ks_meta_ok @@ -331,7 +333,8 @@ class CobblerProfile(): ks_meta_list.append("SYSTEM_STATUS={}".format(status)) ks_meta_list.append("WS_REL_FILESDIR={}".format(self.cfg.cobbler_ws_rel_filesdir)) ks_meta_list.append("COBBLER_URL=http://{}".format(self.cfg.cobbler_host)) - ks_meta_list.append("RHEL9_REPOSERVER_URL={}".format(self.cfg.rhel9_repo_server_url) + if self.current_distro.is_rhel: + ks_meta_list.append("RHEL9_REPOSERVER_URL={}".format(self.cfg.rhel9_repo_server_url) ks_meta = None if ks_meta_list: -- 2.39.5