From 595a3bde98e25cf3b37f10fa8e1c51a022aa4773 Mon Sep 17 00:00:00 2001
From: Yana <yana@correo.ugr.es>
Date: Wed, 22 Dec 2021 10:11:50 +0100
Subject: [PATCH] Remove deprecated configurations

---
 .../agentless_cluster/roles/master-role/files/ossec.conf   | 2 --
 .../agentless_cluster/roles/worker-role/files/ossec.conf   | 2 --
 .../basic_cluster/roles/agent-role/files/ossec.conf        | 7 -------
 .../basic_cluster/roles/master-role/files/ossec.conf       | 2 --
 .../basic_cluster/roles/worker-role/files/ossec.conf       | 2 --
 .../enrollment_cluster/roles/agent-role/files/ossec.conf   | 7 -------
 .../enrollment_cluster/roles/master-role/files/ossec.conf  | 2 --
 .../enrollment_cluster/roles/worker-role/files/ossec.conf  | 2 --
 8 files changed, 26 deletions(-)

diff --git a/tests/system/provisioning/agentless_cluster/roles/master-role/files/ossec.conf b/tests/system/provisioning/agentless_cluster/roles/master-role/files/ossec.conf
index 361d1c9128..644c799b9e 100644
--- a/tests/system/provisioning/agentless_cluster/roles/master-role/files/ossec.conf
+++ b/tests/system/provisioning/agentless_cluster/roles/master-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>
diff --git a/tests/system/provisioning/agentless_cluster/roles/worker-role/files/ossec.conf b/tests/system/provisioning/agentless_cluster/roles/worker-role/files/ossec.conf
index 860a1fcc25..5e2b64fd33 100644
--- a/tests/system/provisioning/agentless_cluster/roles/worker-role/files/ossec.conf
+++ b/tests/system/provisioning/agentless_cluster/roles/worker-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>
diff --git a/tests/system/provisioning/basic_cluster/roles/agent-role/files/ossec.conf b/tests/system/provisioning/basic_cluster/roles/agent-role/files/ossec.conf
index f763575178..7f0004ecd5 100644
--- a/tests/system/provisioning/basic_cluster/roles/agent-role/files/ossec.conf
+++ b/tests/system/provisioning/basic_cluster/roles/agent-role/files/ossec.conf
@@ -45,13 +45,6 @@
     <skip_nfs>yes</skip_nfs>
   </rootcheck>
 
-  <wodle name="open-scap">
-    <disabled>yes</disabled>
-    <timeout>1800</timeout>
-    <interval>1d</interval>
-    <scan-on-start>yes</scan-on-start>
-  </wodle>
-
   <wodle name="cis-cat">
     <disabled>yes</disabled>
     <timeout>1800</timeout>
diff --git a/tests/system/provisioning/basic_cluster/roles/master-role/files/ossec.conf b/tests/system/provisioning/basic_cluster/roles/master-role/files/ossec.conf
index 361d1c9128..644c799b9e 100644
--- a/tests/system/provisioning/basic_cluster/roles/master-role/files/ossec.conf
+++ b/tests/system/provisioning/basic_cluster/roles/master-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>
diff --git a/tests/system/provisioning/basic_cluster/roles/worker-role/files/ossec.conf b/tests/system/provisioning/basic_cluster/roles/worker-role/files/ossec.conf
index 860a1fcc25..5e2b64fd33 100644
--- a/tests/system/provisioning/basic_cluster/roles/worker-role/files/ossec.conf
+++ b/tests/system/provisioning/basic_cluster/roles/worker-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>
diff --git a/tests/system/provisioning/enrollment_cluster/roles/agent-role/files/ossec.conf b/tests/system/provisioning/enrollment_cluster/roles/agent-role/files/ossec.conf
index f763575178..7f0004ecd5 100644
--- a/tests/system/provisioning/enrollment_cluster/roles/agent-role/files/ossec.conf
+++ b/tests/system/provisioning/enrollment_cluster/roles/agent-role/files/ossec.conf
@@ -45,13 +45,6 @@
     <skip_nfs>yes</skip_nfs>
   </rootcheck>
 
-  <wodle name="open-scap">
-    <disabled>yes</disabled>
-    <timeout>1800</timeout>
-    <interval>1d</interval>
-    <scan-on-start>yes</scan-on-start>
-  </wodle>
-
   <wodle name="cis-cat">
     <disabled>yes</disabled>
     <timeout>1800</timeout>
diff --git a/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf b/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf
index 361d1c9128..644c799b9e 100644
--- a/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf
+++ b/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>
diff --git a/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf b/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf
index 860a1fcc25..5e2b64fd33 100644
--- a/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf
+++ b/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf
@@ -252,8 +252,6 @@
     <disabled>no</disabled>
     <port>1515</port>
     <use_source_ip>no</use_source_ip>
-    <force_insert>yes</force_insert>
-    <force_time>0</force_time>
     <purge>yes</purge>
     <use_password>no</use_password>
     <limit_maxagents>yes</limit_maxagents>