From e103fdb99620e4fe9116c35ff2354259fcfd033d Mon Sep 17 00:00:00 2001
From: Avital Pinnick <apinnick@redhat.com>
Date: Wed, 3 Apr 2024 11:35:31 +0200
Subject: [PATCH] Revert "[enterprise-4.16] OADP 3765 - Data Mover new
 parameters"

---
 _topic_maps/_topic_map.yml                                 | 2 +-
 .../installing/about-oadp-1-3-data-mover.adoc              | 5 -----
 .../installing/oadp-backup-restore-csi-snapshots.adoc      | 2 +-
 modules/oadp-1-3-backing-csi-snapshots.adoc                | 7 +++----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index a5de2de9a7..746b6780ad 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -3105,7 +3105,7 @@ Topics:
     Topics:
     - Name: About the OADP 1.3 Data Mover
       File: about-oadp-1-3-data-mover
-    - Name: Backing up and restoring volumes by using CSI snapshots data movement
+    - Name: Backing up and restoring volumes by using CSI snapshots
       File: oadp-backup-restore-csi-snapshots
   - Name: Troubleshooting
     File: troubleshooting
diff --git a/backup_and_restore/application_backup_and_restore/installing/about-oadp-1-3-data-mover.adoc b/backup_and_restore/application_backup_and_restore/installing/about-oadp-1-3-data-mover.adoc
index a733247cd6..b7e628121b 100644
--- a/backup_and_restore/application_backup_and_restore/installing/about-oadp-1-3-data-mover.adoc
+++ b/backup_and_restore/application_backup_and_restore/installing/about-oadp-1-3-data-mover.adoc
@@ -38,16 +38,11 @@ spec:
       - openshift
       - aws
       - csi <3>
-      defaultSnapshotMoveData: true
-      defaultVolumesToFSBackup: <4>
-      featureFlags:
-      - EnableCSI
 # ...
 ----
 <1> The flag to enable the node agent.
 <2> The type of uploader. The possible values are `restic` or `kopia`. The built-in Data Mover uses Kopia as the default uploader mechanism regardless of the value of the `uploaderType` field.
 <3> The CSI plugin included in the list of default plugins.
-<4> Set to `true` if you use Data Mover only for volumes that opt out of `fs-backup`. Set to `false` if you use Data Mover by default for volumes.
 
 [id="built-in-data-mover-crs"]
 == Built-in Data Mover controller and custom resource definitions (CRDs)
diff --git a/backup_and_restore/application_backup_and_restore/installing/oadp-backup-restore-csi-snapshots.adoc b/backup_and_restore/application_backup_and_restore/installing/oadp-backup-restore-csi-snapshots.adoc
index b0b7be6e2e..28d5a58b9a 100644
--- a/backup_and_restore/application_backup_and_restore/installing/oadp-backup-restore-csi-snapshots.adoc
+++ b/backup_and_restore/application_backup_and_restore/installing/oadp-backup-restore-csi-snapshots.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="oadp-backup-restore-csi-snapshots"]
-= Backing up and restoring CSI snapshots data movement
+= Backing up and restoring CSI snapshots
 include::_attributes/common-attributes.adoc[]
 :context: oadp-backup-restore-csi-snapshots
 
diff --git a/modules/oadp-1-3-backing-csi-snapshots.adoc b/modules/oadp-1-3-backing-csi-snapshots.adoc
index 88865c8bc8..289a515e06 100644
--- a/modules/oadp-1-3-backing-csi-snapshots.adoc
+++ b/modules/oadp-1-3-backing-csi-snapshots.adoc
@@ -29,19 +29,18 @@ metadata:
   namespace: openshift-adp
 spec:
   csiSnapshotTimeout: 10m0s
-  defaultVolumesToFsBackup: <1>
+  defaultVolumesToFsBackup: false
   includedNamespaces:
   - mysql-persistent
   itemOperationTimeout: 4h0m0s
-  snapshotMoveData: true <2>
+  snapshotMoveData: true <1>
   storageLocation: default
   ttl: 720h0m0s
   volumeSnapshotLocations:
   - dpa-sample-1
 # ...
 ----
-<1> Set to `true` if you use Data Mover only for volumes that opt out of `fs-backup`. Set to `false` if you use Data Mover by default for volumes.
-<2> Set to `true` to enable movement of CSI snapshots to remote object storage.
+<1> Set to `true` to enable movement of CSI snapshots to remote object storage.
 
 . Apply the manifest:
 +