Fixed RHOSP products.

Changed the configuration, so all OVALs that are included in the original OSP benchmark have all of the OVALs resolved.
ComplianceAsCode · Nov 20, 2020 · 38f9b96 · 38f9b96
1 parent 2079040
commit 38f9b96
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/build/.gitkeep b/build/.gitkeep
diff --git a/...system/network/network-ipv6/disabling_ipv6/sysctl_net_ipv6_conf_all_disable_ipv6/rule.yml b/...system/network/network-ipv6/disabling_ipv6/sysctl_net_ipv6_conf_all_disable_ipv6/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: fedora,rhcos4,ol7,ol8,rhel7,rhel8,rhv4,sle15,wrlinux1019
+prodtype: fedora,rhcos4,ocp4,ol7,ol8,rhel7,rhel8,rhosp10,rhosp13,rhv4,sle15,wrlinux1019
 
 title: 'Disable IPv6 Networking Support Automatic Loading'
 

diff --git a/linux_os/guide/system/selinux/selinux_state/rule.yml b/linux_os/guide/system/selinux/selinux_state/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: fedora,rhcos4,ol7,ol8,rhel7,rhel8,rhv4,sle15,wrlinux1019
+prodtype: fedora,rhcos4,ocp4,ol7,ol8,rhel7,rhel8,rhosp10,rhosp13,rhv4,sle15,wrlinux1019
 
 title: 'Ensure SELinux State is Enforcing'
 

diff --git a/linux_os/guide/system/software/integrity/disable_prelink/rule.yml b/linux_os/guide/system/software/integrity/disable_prelink/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: ol7,rhel7
+prodtype: rhcos4,ol7,rhel7,wrlinux1019
 
 title: 'Disable Prelinking'
 

diff --git a/...ftware/mcafee_security_software/mcafee_hbss_software/package_MFEhiplsm_installed/rule.yml b/...ftware/mcafee_security_software/mcafee_hbss_software/package_MFEhiplsm_installed/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: fedora,rhcos4,rhel7,rhel8,rhv4
+prodtype: fedora,ocp4,rhcos4,rhel7,rhel8,rhosp10,rhosp13,rhv4
 
 title: 'Install the Host Intrusion Prevention System (HIPS) Module'
 

diff --git a/ocp4/product.yml b/ocp4/product.yml
@@ -3,6 +3,10 @@ full_name: Red Hat OpenShift Container Platform 4
 type: platform
 
 benchmark_root: "../applications"
+additional_content_directories:
+  - "../linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software"
+  - "../linux_os/guide/system/network/network-ipv6/disabling_ipv6"
+  - "../linux_os/guide/system/selinux"
 
 profiles_root: "./profiles"
 

diff --git a/rhosp10/product.yml b/rhosp10/product.yml
@@ -3,6 +3,10 @@ full_name: Red Hat OpenStack Platform 10
 type: platform
 
 benchmark_root: "../applications"
+additional_content_directories:
+  - "../linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software"
+  - "../linux_os/guide/system/network/network-ipv6/disabling_ipv6"
+  - "../linux_os/guide/system/selinux"
 
 profiles_root: "./profiles"
 

diff --git a/rhosp13/product.yml b/rhosp13/product.yml
@@ -3,6 +3,10 @@ full_name: Red Hat OpenStack Platform 13
 type: platform
 
 benchmark_root: "../applications"
+additional_content_directories:
+  - "../linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software"
+  - "../linux_os/guide/system/network/network-ipv6/disabling_ipv6"
+  - "../linux_os/guide/system/selinux"
 
 profiles_root: "./profiles"