From b0f700e8aa7ae0e5755d9dd3043703c2235eb645 Mon Sep 17 00:00:00 2001
From: Seena Fallah <seenafallah@gmail.com>
Date: Wed, 6 Mar 2024 13:33:59 +0100
Subject: [PATCH] ceph-volume: disable dmcrypt by default

regression by dcdb1710cbaf7946cf8161b4395697d4898680d3

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
---
 group_vars/all.yml.sample        | 2 --
 group_vars/osds.yml.sample       | 2 +-
 roles/ceph-osd/defaults/main.yml | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a2651614a3..d596d53a72 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -541,8 +541,6 @@ dummy:
 #    CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
 #    TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES: "{{ ceph_tcmalloc_max_total_thread_cache }}"
 #  args:
-#    - --setuser=ceph
-#    - --setgroup=ceph
 #    - --default-log-to-file=false
 #    - --default-log-to-stderr=true
 #    - --default-log-stderr-prefix="debug "
diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 694b03ca5b..2238716f36 100644
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -68,7 +68,7 @@ dummy:
 
 # Encrypt your OSD device using dmcrypt
 # If set to True, no matter which osd_objecstore you use the data will be encrypted
-#dmcrypt: true
+#dmcrypt: false
 
 # Use ceph-volume to create OSDs from logical volumes.
 # lvm_volumes is a list of dictionaries.
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 37e2d9fa81..5e86c61867 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -60,7 +60,7 @@ osd_auto_discovery: false
 
 # Encrypt your OSD device using dmcrypt
 # If set to True, no matter which osd_objecstore you use the data will be encrypted
-dmcrypt: true
+dmcrypt: false
 
 # Use ceph-volume to create OSDs from logical volumes.
 # lvm_volumes is a list of dictionaries.