From 1c7276f10a9ff1d61a24464f1811240bb21f0f3a Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 27 Feb 2023 09:02:12 -0700 Subject: [PATCH] remove rhc role for now Resolves:rhbz#2141330 : rhc - new role for subscription management/registration/insights remove role until https://bugzilla.redhat.com/show_bug.cgi?id=2171829 is fixed --- CHANGELOG.md | 1 - linux-system-roles.spec | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8da549..057341c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,6 @@ Changelog - [network - Support looking up named route table in routing rule](https://bugzilla.redhat.com/show_bug.cgi?id=2131293) - [podman - New role - manage podman containers and systemd](https://bugzilla.redhat.com/show_bug.cgi?id=2143427) - [postfix - convert postfix role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130329) -- [rhc - New role - subscription management/registration/insights](https://bugzilla.redhat.com/show_bug.cgi?id=2141330) - [selinux - add support for the 'local' parameter](https://bugzilla.redhat.com/show_bug.cgi?id=2128843) - [vpn - Add parameters shared_key_content, ike, esp, type, leftid, rightid](https://bugzilla.redhat.com/show_bug.cgi?id=2119102) - [vpn - convert vpn role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130344) diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 8a3f0a9..3a6f57f 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -30,7 +30,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management Version: 1.21.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -179,8 +179,8 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %global rolename22 ad_integration %deftag 22 1.0.2 -%global rolename23 rhc -%deftag 23 1.1.0 +#%%global rolename23 rhc +#%%deftag 23 1.1.0 %global rolename24 journald %deftag 24 1.0.0 @@ -207,7 +207,7 @@ Source19: %{archiveurl19} Source20: %{archiveurl20} Source21: %{archiveurl21} Source22: %{archiveurl22} -Source23: %{archiveurl23} +#Source23: %{archiveurl23} Source24: %{archiveurl24} # END AUTOGENERATED SOURCES @@ -275,7 +275,8 @@ end %prep # BEGIN AUTOGENERATED SETUP -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0} +#%%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0} +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a24 -n %{getarchivedir 0} # END AUTOGENERATED SETUP %if 0%{?rhel} @@ -372,8 +373,8 @@ done # - Module seport, sefcontext and selogin for the selinux role rolename2 # - Module ini_file for role tlog # - rhc modules -module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" - ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" ) +# ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" ) +module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" ) for module in "${!module_map[@]}"; do role="${module_map[${module}]}" if [ ! -d $role/library ]; then @@ -748,6 +749,10 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Wed Feb 22 2023 Rich Megginson - 1.21.0-2 +- Resolves:rhbz#2141330 : rhc - new role for subscription management/registration/insights +- remove role until https://bugzilla.redhat.com/show_bug.cgi?id=2171829 is fixed + * Mon Feb 20 2023 Rich Megginson - 1.21.0-1 - Resolves:rhbz#2168735 : network - RedHat Role rhel-system-roles.network should route traffic via correct bond