From 8eebb22ea461e195b857eb3ddd7ac7b3584672a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zuzana=20Lena=20Ansorgov=C3=A1?= Date: Thu, 25 Jul 2024 16:33:13 +0200 Subject: [PATCH] Redefine oscap prerequisite for upstream (#3159) --- ...-policy-in-a-host-group-using-ansible.adoc | 2 +- ...a-policy-in-a-host-group-using-puppet.adoc | 2 +- ...ying-a-policy-on-a-host-using-ansible.adoc | 2 +- ...oying-a-policy-on-a-host-using-puppet.adoc | 2 +- ..._prerequisite-repositories-with-oscap.adoc | 24 +++++++++++++++++++ .../snip_prerequisite-rhel-repositories.adoc | 6 ----- 6 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 guides/common/modules/snip_prerequisite-repositories-with-oscap.adoc delete mode 100644 guides/common/modules/snip_prerequisite-rhel-repositories.adoc diff --git a/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-ansible.adoc b/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-ansible.adoc index f1ecb4040e0..ebab9ba8915 100644 --- a/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-ansible.adoc +++ b/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-ansible.adoc @@ -14,7 +14,7 @@ endif::[] ifndef::satellite[] For more information, see xref:Installing_the_OpenSCAP_plugin_{context}[]. endif::[] -include::snip_prerequisite-rhel-repositories.adoc[] +include::snip_prerequisite-repositories-with-oscap.adoc[] * You have enabled and synced the {project-client-name} repository to {Project}, and enabled it on the hosts. * You have xref:Creating_a_Compliance_Policy_{context}[created a compliance policy] with the Ansible deployment option and assigned the host group. diff --git a/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-puppet.adoc b/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-puppet.adoc index 69bb8c71a38..9b1d9b5acfe 100644 --- a/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-puppet.adoc +++ b/guides/common/modules/proc_deploying-a-policy-in-a-host-group-using-puppet.adoc @@ -14,7 +14,7 @@ endif::[] ifndef::satellite[] For more information, see xref:Installing_the_OpenSCAP_plugin_{context}[]. endif::[] -include::snip_prerequisite-rhel-repositories.adoc[] +include::snip_prerequisite-repositories-with-oscap.adoc[] * You have enabled and synced the {project-client-name} repository to {Project}, and enabled it on the hosts. * You have xref:Creating_a_Compliance_Policy_{context}[created a compliance policy] with the Puppet deployment option and assigned the host group. diff --git a/guides/common/modules/proc_deploying-a-policy-on-a-host-using-ansible.adoc b/guides/common/modules/proc_deploying-a-policy-on-a-host-using-ansible.adoc index a760aed770a..0c02b853591 100644 --- a/guides/common/modules/proc_deploying-a-policy-on-a-host-using-ansible.adoc +++ b/guides/common/modules/proc_deploying-a-policy-on-a-host-using-ansible.adoc @@ -14,7 +14,7 @@ endif::[] ifndef::satellite[] For more information, see xref:Installing_the_OpenSCAP_plugin_{context}[]. endif::[] -include::snip_prerequisite-rhel-repositories.adoc[] +include::snip_prerequisite-repositories-with-oscap.adoc[] * You have enabled and synced the {project-client-name} repository to {Project}, and enabled it on the host. * You have xref:Creating_a_Compliance_Policy_{context}[created a compliance policy] with the Ansible deployment option. diff --git a/guides/common/modules/proc_deploying-a-policy-on-a-host-using-puppet.adoc b/guides/common/modules/proc_deploying-a-policy-on-a-host-using-puppet.adoc index f5edc44c645..a03241adb48 100644 --- a/guides/common/modules/proc_deploying-a-policy-on-a-host-using-puppet.adoc +++ b/guides/common/modules/proc_deploying-a-policy-on-a-host-using-puppet.adoc @@ -14,7 +14,7 @@ endif::[] ifndef::satellite[] For more information, see xref:Installing_the_OpenSCAP_plugin_{context}[]. endif::[] -include::snip_prerequisite-rhel-repositories.adoc[] +include::snip_prerequisite-repositories-with-oscap.adoc[] * You have enabled and synced the {project-client-name} repository to {Project}, and enabled it on the host. * You have xref:Creating_a_Compliance_Policy_{context}[created a compliance policy] with the Puppet deployment option. diff --git a/guides/common/modules/snip_prerequisite-repositories-with-oscap.adoc b/guides/common/modules/snip_prerequisite-repositories-with-oscap.adoc new file mode 100644 index 00000000000..e8a35d37ac4 --- /dev/null +++ b/guides/common/modules/snip_prerequisite-repositories-with-oscap.adoc @@ -0,0 +1,24 @@ +ifdef::foreman-el,foreman-deb[] +* Ensure that a repository that provides the `openscap-scanner` package and its dependencies is enabled on the host. +endif::[] +ifndef::foreman-el,foreman-deb[] +* Repositories for the operating system version of the host are synchronized on {ProjectServer} and enabled on the host. +ifdef::client-content-dnf[] +ifndef::satellite[] +For example, for {EL} you might require: +endif::[] +** {EL} 9 BaseOS and Appstream RPMs repositories +** {EL} 8 BaseOS and Appstream RPMs repositories +** {EL} 7 Server and Extras RPMs repositories +endif::[] +endif::[] +ifndef::client-content-dnf[] +You might require: +** For Ubuntu 24.04 "Noble": Suite `noble` and components `main universe` +** For Debian 12 "Bookworm": Suite `bookworm` and component `main` +endif::[] +ifndef::satellite[] + ++ +You need repositories that provide the `openscap-scanner` package and its dependencies. +endif::[] diff --git a/guides/common/modules/snip_prerequisite-rhel-repositories.adoc b/guides/common/modules/snip_prerequisite-rhel-repositories.adoc deleted file mode 100644 index 1a202ca31a4..00000000000 --- a/guides/common/modules/snip_prerequisite-rhel-repositories.adoc +++ /dev/null @@ -1,6 +0,0 @@ -ifdef::client-content-dnf[] -* You have enabled and synced the operating system repositories to {Project}, and enabled them on the hosts: -** {RHEL} 9 for x86_64 - BaseOS and Appstream (RPMs) {endash} `rhel-9-for-x86_64-baseos-rpms` and `rhel-9-for-x86_64-appstream-rpms` -** {RHEL} 8 for x86_64 - BaseOS and Appstream (RPMs) {endash} `rhel-8-for-x86_64-baseos-rpms` and `rhel-8-for-x86_64-appstream-rpms` -** {RHEL} 7 Server and Extras (RPMs) {endash} `rhel-7-server-rpms` and `rhel-7-server-extras-rpms` -endif::[]