Update rule package_bind_removed for RHEL 9.6 #13168

jan-cerny · 2025-03-12T12:55:39Z

Description:

We have productization issue #13107 that test scenario package-installed.fail fails for rule package_bind_removed on RHEL 9.6. I have discovered that if dnf install bind is run on RHEL 9.6 the actual package that it installs is bind9.18, not bind. This is a difference from RHEL 9.5.

We will fix this issue by making sure both bind and bind9.18 RPM packages are removed by the rule.

To do this, we will add a feature to the package_removed template that allows you specify multiple package names instead of only single package name.

Fixes: #13107

The `pkgname` parameter of the `package_removed` template will be allowed to be either a name of a single package or a list of names.

Starting from RHEL 9.6, the actual RPM package that gets installed if an user runs the `dnf install bind` command isn't `bind` but it's `bind9.18`. However, we need to keep the old name as well, so that the rule works on RHEL 9 older than 9.6. We will use the new feature of the `package_removed` template that allows us to specify a list of packages in the `pkgname` parameter.

openshift-ci · 2025-03-12T12:55:44Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

github-actions · 2025-03-12T12:59:59Z

This datastream diff is auto generated by the check Compare DS/Generate Diff.
Due to the excessive size of the diff, it has been trimmed to fit the 65535-character limit.

Click here to see the trimmed diff

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q gdm; then
 
 # CAUTION: This remediation script will remove gdm
-#	   from the system, and may remove any packages
-#	   that depend on gdm. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on gdm. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "gdm" ; then
 yum remove -y "gdm"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -13,7 +13,7 @@
   - no_reboot_needed
   - package_gdm_removed
 
-- name: Ensure gdm is removed
+- name: 'Remove the GDM Package Group: Ensure gdm is removed'
   package:
     name: gdm
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -1,3 +1,4 @@
+
 include remove_gdm
 
 class remove_gdm {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=gdm

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -1,2 +1,3 @@
+
 
 package remove gdm

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove gdm

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-addon-ccpp
-#	   from the system, and may remove any packages
-#	   that depend on abrt-addon-ccpp. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-addon-ccpp. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-addon-ccpp" ; then
 yum remove -y "abrt-addon-ccpp"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,4 +1,4 @@
-- name: Ensure abrt-addon-ccpp is removed
+- name: 'Uninstall abrt-addon-ccpp Package: Ensure abrt-addon-ccpp is removed'
   package:
     name: abrt-addon-ccpp
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-addon-ccpp
 
 class remove_abrt-addon-ccpp {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-addon-ccpp

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-addon-ccpp

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-addon-ccpp

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-addon-kerneloops
-#	   from the system, and may remove any packages
-#	   that depend on abrt-addon-kerneloops. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-addon-kerneloops. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-addon-kerneloops" ; then
 yum remove -y "abrt-addon-kerneloops"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,4 +1,5 @@
-- name: Ensure abrt-addon-kerneloops is removed
+- name: 'Uninstall abrt-addon-kerneloops Package: Ensure abrt-addon-kerneloops is
+    removed'
   package:
     name: abrt-addon-kerneloops
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-addon-kerneloops
 
 class remove_abrt-addon-kerneloops {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-addon-kerneloops

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-addon-kerneloops

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-addon-kerneloops

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-cli
-#	   from the system, and may remove any packages
-#	   that depend on abrt-cli. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-cli. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-cli" ; then
 yum remove -y "abrt-cli"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,4 +1,4 @@
-- name: Ensure abrt-cli is removed
+- name: 'Uninstall abrt-cli Package: Ensure abrt-cli is removed'
   package:
     name: abrt-cli
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-cli
 
 class remove_abrt-cli {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-cli

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-cli

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-cli

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-plugin-logger
-#	   from the system, and may remove any packages
-#	   that depend on abrt-plugin-logger. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-plugin-logger. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-plugin-logger" ; then
 yum remove -y "abrt-plugin-logger"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,4 +1,4 @@
-- name: Ensure abrt-plugin-logger is removed
+- name: 'Uninstall abrt-plugin-logger Package: Ensure abrt-plugin-logger is removed'
   package:
     name: abrt-plugin-logger
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-plugin-logger
 
 class remove_abrt-plugin-logger {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-plugin-logger

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-plugin-logger

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-plugin-logger

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-plugin-rhtsupport
-#	   from the system, and may remove any packages
-#	   that depend on abrt-plugin-rhtsupport. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-plugin-rhtsupport. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-plugin-rhtsupport" ; then
 yum remove -y "abrt-plugin-rhtsupport"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,4 +1,5 @@
-- name: Ensure abrt-plugin-rhtsupport is removed
+- name: 'Uninstall abrt-plugin-rhtsupport Package: Ensure abrt-plugin-rhtsupport is
+    removed'
   package:
     name: abrt-plugin-rhtsupport
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-plugin-rhtsupport
 
 class remove_abrt-plugin-rhtsupport {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-plugin-rhtsupport

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-plugin-rhtsupport

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-plugin-rhtsupport

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt-plugin-sosreport
-#	   from the system, and may remove any packages
-#	   that depend on abrt-plugin-sosreport. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt-plugin-sosreport. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt-plugin-sosreport" ; then
 yum remove -y "abrt-plugin-sosreport"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,4 +1,5 @@
-- name: Ensure abrt-plugin-sosreport is removed
+- name: 'Uninstall abrt-plugin-sosreport Package: Ensure abrt-plugin-sosreport is
+    removed'
   package:
     name: abrt-plugin-sosreport
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt-plugin-sosreport
 
 class remove_abrt-plugin-sosreport {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt-plugin-sosreport

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt-plugin-sosreport

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt-plugin-sosreport

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove geolite2-city
-#	   from the system, and may remove any packages
-#	   that depend on geolite2-city. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on geolite2-city. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "geolite2-city" ; then
 yum remove -y "geolite2-city"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,4 +1,4 @@
-- name: Ensure geolite2-city is removed
+- name: 'Uninstall geolite2-city Package: Ensure geolite2-city is removed'
   package:
     name: geolite2-city
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,3 +1,4 @@
+
 include remove_geolite2-city
 
 class remove_geolite2-city {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=geolite2-city

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,2 +1,3 @@
+
 
 package remove geolite2-city

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove geolite2-city

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove geolite2-country
-#	   from the system, and may remove any packages
-#	   that depend on geolite2-country. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on geolite2-country. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "geolite2-country" ; then
 yum remove -y "geolite2-country"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,4 +1,4 @@
-- name: Ensure geolite2-country is removed
+- name: 'Uninstall geolite2-country Package: Ensure geolite2-country is removed'
   package:
     name: geolite2-country
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,3 +1,4 @@
+
 include remove_geolite2-country
 
 class remove_geolite2-country {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=geolite2-country

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,2 +1,3 @@
+
 
 package remove geolite2-country

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove geolite2-country

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove gssproxy
-#	   from the system, and may remove any packages
-#	   that depend on gssproxy. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on gssproxy. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "gssproxy" ; then
 yum remove -y "gssproxy"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -1,4 +1,4 @@
-- name: Ensure gssproxy is removed
+- name: 'Uninstall gssproxy Package: Ensure gssproxy is removed'
   package:
     name: gssproxy
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -1,3 +1,4 @@
+
 include remove_gssproxy
 
 class remove_gssproxy {

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -1,2 +1,3 @@
+
 
 package remove gssproxy

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove gssproxy

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove iprutils
-#	   from the system, and may remove any packages
-#	   that depend on iprutils. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on iprutils. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "iprutils" ; then
 yum remove -y "iprutils"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,4 +1,4 @@
-- name: Ensure iprutils is removed
+- name: 'Uninstall iprutils Package: Ensure iprutils is removed'
   package:
     name: iprutils
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,3 +1,4 @@
+
 include remove_iprutils
 
 class remove_iprutils {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=iprutils

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,2 +1,3 @@
+
 
 package remove iprutils

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove iprutils

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove krb5-workstation
-#	   from the system, and may remove any packages
-#	   that depend on krb5-workstation. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on krb5-workstation. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "krb5-workstation" ; then
 yum remove -y "krb5-workstation"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,4 +1,4 @@
-- name: Ensure krb5-workstation is removed
+- name: 'Uninstall krb5-workstation Package: Ensure krb5-workstation is removed'
   package:
     name: krb5-workstation
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,3 +1,4 @@
+
 include remove_krb5-workstation
 
 class remove_krb5-workstation {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=krb5-workstation

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,2 +1,3 @@
+
 
 package remove krb5-workstation

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove krb5-workstation

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove libreport-plugin-logger
-#	   from the system, and may remove any packages
-#	   that depend on libreport-plugin-logger. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on libreport-plugin-logger. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "libreport-plugin-logger" ; then
 yum remove -y "libreport-plugin-logger"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,4 +1,5 @@
-- name: Ensure libreport-plugin-logger is removed
+- name: 'Uninstall libreport-plugin-logger Package: Ensure libreport-plugin-logger
+    is removed'
   package:
     name: libreport-plugin-logger
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,3 +1,4 @@
+
 include remove_libreport-plugin-logger
 
 class remove_libreport-plugin-logger {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=libreport-plugin-logger

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 package remove libreport-plugin-logger

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove libreport-plugin-logger

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove libreport-plugin-rhtsupport
-#	   from the system, and may remove any packages
-#	   that depend on libreport-plugin-rhtsupport. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on libreport-plugin-rhtsupport. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "libreport-plugin-rhtsupport" ; then
 yum remove -y "libreport-plugin-rhtsupport"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,4 +1,5 @@
-- name: Ensure libreport-plugin-rhtsupport is removed
+- name: 'Uninstall libreport-plugin-rhtsupport Package: Ensure libreport-plugin-rhtsupport
+    is removed'
   package:
     name: libreport-plugin-rhtsupport
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,3 +1,4 @@
+
 include remove_libreport-plugin-rhtsupport
 
 class remove_libreport-plugin-rhtsupport {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=libreport-plugin-rhtsupport

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 package remove libreport-plugin-rhtsupport

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove libreport-plugin-rhtsupport

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove pigz
-#	   from the system, and may remove any packages
-#	   that depend on pigz. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on pigz. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "pigz" ; then
 yum remove -y "pigz"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,4 +1,4 @@
-- name: Ensure pigz is removed
+- name: 'Uninstall pigz Package: Ensure pigz is removed'
   package:
     name: pigz
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,3 +1,4 @@
+
 include remove_pigz
 
 class remove_pigz {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=pigz

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,2 +1,3 @@
+
 
 package remove pigz

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove pigz

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove python3-abrt-addon
-#	   from the system, and may remove any packages
-#	   that depend on python3-abrt-addon. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on python3-abrt-addon. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "python3-abrt-addon" ; then
 yum remove -y "python3-abrt-addon"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,4 +1,4 @@
-- name: Ensure python3-abrt-addon is removed
+- name: 'Uninstall python3-abrt-addon Package: Ensure python3-abrt-addon is removed'
   package:
     name: python3-abrt-addon
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,3 +1,4 @@
+
 include remove_python3-abrt-addon
 
 class remove_python3-abrt-addon {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=python3-abrt-addon

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,2 +1,3 @@
+
 
 package remove python3-abrt-addon

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove python3-abrt-addon

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove tuned
-#	   from the system, and may remove any packages
-#	   that depend on tuned. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on tuned. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "tuned" ; then
 yum remove -y "tuned"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,4 +1,4 @@
-- name: Ensure tuned is removed
+- name: 'Uninstall tuned Package: Ensure tuned is removed'
   package:
     name: tuned
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,3 +1,4 @@
+
 include remove_tuned
 
 class remove_tuned {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=tuned

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,2 +1,3 @@
+
 
 package remove tuned

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove tuned

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q iptables; then
 
 # CAUTION: This remediation script will remove iptables-services
-#	   from the system, and may remove any packages
-#	   that depend on iptables-services. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on iptables-services. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "iptables-services" ; then
 yum remove -y "iptables-services"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -10,7 +10,7 @@
   - no_reboot_needed
   - package_iptables-services_removed
 
-- name: Ensure iptables-services is removed
+- name: 'Remove iptables-services Package: Ensure iptables-services is removed'
   package:
     name: iptables-services
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -1,3 +1,4 @@
+
 include remove_iptables-services
 
 class remove_iptables-services {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=iptables-services

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -1,2 +1,3 @@
+
 
 package remove iptables-services

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove iptables-services

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q kernel; then
 
 # CAUTION: This remediation script will remove mcstrans
-#	   from the system, and may remove any packages
-#	   that depend on mcstrans. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on mcstrans. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "mcstrans" ; then
 yum remove -y "mcstrans"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -10,7 +10,7 @@
   - no_reboot_needed
   - package_mcstrans_removed
 
-- name: Ensure mcstrans is removed
+- name: 'Uninstall mcstrans Package: Ensure mcstrans is removed'
   package:
     name: mcstrans
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -1,3 +1,4 @@
+
 include remove_mcstrans
 
 class remove_mcstrans {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=mcstrans

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -1,2 +1,3 @@
+
 
 package remove mcstrans

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove mcstrans

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q kernel; then
 
 # CAUTION: This remediation script will remove setroubleshoot-plugins
-#	   from the system, and may remove any packages
-#	   that depend on setroubleshoot-plugins. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on setroubleshoot-plugins. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "setroubleshoot-plugins" ; then
 yum remove -y "setroubleshoot-plugins"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -10,7 +10,8 @@
   - no_reboot_needed
   - package_setroubleshoot-plugins_removed
 
-- name: Ensure setroubleshoot-plugins is removed
+- name: 'Uninstall setroubleshoot-plugins Package: Ensure setroubleshoot-plugins is
+    removed'
   package:
     name: setroubleshoot-plugins
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -1,3 +1,4 @@
+
 include remove_setroubleshoot-plugins
 
 class remove_setroubleshoot-plugins {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=setroubleshoot-plugins

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -1,2 +1,3 @@
+
 
 package remove setroubleshoot-plugins

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove setroubleshoot-plugins

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q kernel; then
 
 # CAUTION: This remediation script will remove setroubleshoot-server
-#	   from the system, and may remove any packages
-#	   that depend on setroubleshoot-server. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on setroubleshoot-server. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "setroubleshoot-server" ; then
 yum remove -y "setroubleshoot-server"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -10,7 +10,8 @@
   - no_reboot_needed
   - package_setroubleshoot-server_removed
 
-- name: Ensure setroubleshoot-server is removed
+- name: 'Uninstall setroubleshoot-server Package: Ensure setroubleshoot-server is
+    removed'
   package:
     name: setroubleshoot-server
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -1,3 +1,4 @@
+
 include remove_setroubleshoot-server
 
 class remove_setroubleshoot-server {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=setroubleshoot-server

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -1,2 +1,3 @@
+
 
 package remove setroubleshoot-server

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove setroubleshoot-server

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -2,10 +2,11 @@
 if rpm --quiet -q kernel; then
 
 # CAUTION: This remediation script will remove setroubleshoot
-#	   from the system, and may remove any packages
-#	   that depend on setroubleshoot. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on setroubleshoot. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "setroubleshoot" ; then
 yum remove -y "setroubleshoot"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -10,7 +10,7 @@
   - no_reboot_needed
   - package_setroubleshoot_removed
 
-- name: Ensure setroubleshoot is removed
+- name: 'Uninstall setroubleshoot Package: Ensure setroubleshoot is removed'
   package:
     name: setroubleshoot
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -1,3 +1,4 @@
+
 include remove_setroubleshoot
 
 class remove_setroubleshoot {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=setroubleshoot

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -1,2 +1,3 @@
+
 
 package remove setroubleshoot

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove setroubleshoot

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove avahi-autoipd
-#	   from the system, and may remove any packages
-#	   that depend on avahi-autoipd. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on avahi-autoipd. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "avahi-autoipd" ; then
 yum remove -y "avahi-autoipd"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,4 +1,4 @@
-- name: Ensure avahi-autoipd is removed
+- name: 'Uninstall avahi-autoipd Server Package: Ensure avahi-autoipd is removed'
   package:
     name: avahi-autoipd
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,3 +1,4 @@
+
 include remove_avahi-autoipd
 
 class remove_avahi-autoipd {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=avahi-autoipd

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,2 +1,3 @@
+
 
 package remove avahi-autoipd

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove avahi-autoipd

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove avahi
-#	   from the system, and may remove any packages
-#	   that depend on avahi. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on avahi. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "avahi" ; then
 yum remove -y "avahi"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,4 +1,4 @@
-- name: Ensure avahi is removed
+- name: 'Uninstall avahi Server Package: Ensure avahi is removed'
   package:
     name: avahi
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,3 +1,4 @@
+
 include remove_avahi
 
 class remove_avahi {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=avahi

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,2 +1,3 @@
+
 
 package remove avahi

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove avahi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove abrt
-#	   from the system, and may remove any packages
-#	   that depend on abrt. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on abrt. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "abrt" ; then
 yum remove -y "abrt"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,4 +1,4 @@
-- name: Ensure abrt is removed
+- name: 'Uninstall Automatic Bug Reporting Tool (abrt): Ensure abrt is removed'
   package:
     name: abrt
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,3 +1,4 @@
+
 include remove_abrt
 
 class remove_abrt {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=abrt

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,2 +1,3 @@
+
 
 package remove abrt

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove abrt

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove inetutils-telnetd
-#	   from the system, and may remove any packages
-#	   that depend on inetutils-telnetd. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on inetutils-telnetd. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "inetutils-telnetd" ; then
 yum remove -y "inetutils-telnetd"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,4 +1,4 @@
-- name: Ensure inetutils-telnetd is removed
+- name: 'Uninstall the inet-based telnet server: Ensure inetutils-telnetd is removed'
   package:
     name: inetutils-telnetd
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,3 +1,4 @@
+
 include remove_inetutils-telnetd
 
 class remove_inetutils-telnetd {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=inetutils-telnetd

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,2 +1,3 @@
+
 
 package remove inetutils-telnetd

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove inetutils-telnetd

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove nis
-#	   from the system, and may remove any packages
-#	   that depend on nis. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on nis. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "nis" ; then
 yum remove -y "nis"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,4 +1,4 @@
-- name: Ensure nis is removed
+- name: 'Uninstall the nis package: Ensure nis is removed'
   package:
     name: nis
     state: absent

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,3 +1,4 @@
+
 include remove_nis
 
 class remove_nis {

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,2 +1,3 @@
+
 
 package --remove=nis

kickstart remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,2 +1,3 @@
+
 
 package remove nis

bootc remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -1,2 +1,3 @@
+
 
 dnf remove nis

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_ntpdate_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ntpdate_removed
+++ xccdf_org.ssgproject.content_rule_package_ntpdate_removed
@@ -1,9 +1,10 @@
 
 # CAUTION: This remediation script will remove ntpdate
-#	   from the system, and may remove any packages
-#	   that depend on ntpdate. Execute this
-#	   remediation AFTER testing on a non-production
-#	   system!
+# from the system, and may remove any packages
+# that depend on ntpdate. Execute this
+# remediation AFTER testing on a non-production
+# system!
+
 
 if rpm -q --quiet "ntpdate" ; then
 yum remove -y "ntpdate"

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_ntpdate_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ntpdate_removed
+++ xccdf_org.ssgproject.content_rule_package_ntpdate_remov

... The diff is trimmed here ...

Account for situation that the `pkgname` template parameter can be a list. In this situation, we will use the first item in the list for the purpose of searching components.

codeclimate · 2025-03-13T13:05:58Z

Code Climate has analyzed commit e7c5f1c and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 62.0% (0.0% change).

View more on Code Climate.

jan-cerny added 4 commits March 12, 2025 13:38

Allow list of packages in template package_removed

41e6282

The `pkgname` parameter of the `package_removed` template will be allowed to be either a name of a single package or a list of names.

Improve template documentation

7618cb3

Describe RHEL 9.6 situation

70fcd99

openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Mar 12, 2025

jan-cerny added this to the 0.1.77 milestone Mar 12, 2025

jan-cerny added OVAL OVAL update. Related to the systems assessments. Update Rule Issues or pull requests related to Rules updates. RHEL9 Red Hat Enterprise Linux 9 product related. labels Mar 12, 2025

jan-cerny added 2 commits March 12, 2025 15:59

Update tests for package_bind_removed

4cc0767

Fix components test

e7c5f1c

Account for situation that the `pkgname` template parameter can be a list. In this situation, we will use the first item in the list for the purpose of searching components.

jan-cerny marked this pull request as ready for review March 14, 2025 12:30

openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Mar 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update rule package_bind_removed for RHEL 9.6 #13168

Update rule package_bind_removed for RHEL 9.6 #13168

jan-cerny commented Mar 12, 2025

openshift-ci bot commented Mar 12, 2025

github-actions bot commented Mar 12, 2025

codeclimate bot commented Mar 13, 2025

Update rule package_bind_removed for RHEL 9.6 #13168

Are you sure you want to change the base?

Update rule package_bind_removed for RHEL 9.6 #13168

Conversation

jan-cerny commented Mar 12, 2025

Description:

openshift-ci bot commented Mar 12, 2025

github-actions bot commented Mar 12, 2025

codeclimate bot commented Mar 13, 2025