From 00bdb60663aec7a65fd8c9bf4a938721eb0d0a29 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 9 Dec 2019 18:31:52 +0100
Subject: [PATCH] defaults: add a comment

This commit isolates and adds an explicit comment about variables not
intended to be modified by the user.

Fixes: #4828

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a234338eff4b4e35e1c0504ae2ee005e4ca76cf7)
---
 group_vars/all.yml.sample             | 10 ++++++++--
 group_vars/clients.yml.sample         |  1 -
 group_vars/osds.yml.sample            |  1 -
 group_vars/rhcs.yml.sample            | 10 ++++++++--
 roles/ceph-defaults/defaults/main.yml | 11 +++++++++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 4e609441d..b2c3ff34c 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -565,8 +565,6 @@ dummy:
 ##########
 # DOCKER #
 ##########
-#container_exec_cmd:
-#docker: false
 #ceph_docker_image: "ceph/daemon"
 #ceph_docker_image_tag: latest
 #ceph_docker_registry: docker.io
@@ -833,3 +831,11 @@ dummy:
 
 #use_fqdn_yes_i_am_sure: false
 
+
+######################################################
+# VARIABLES BELOW SHOULD NOT BE MODIFIED BY THE USER #
+#               *DO NOT* MODIFY THEM                 #
+######################################################
+
+#container_exec_cmd:
+#docker: false
diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample
index f98167a3a..cd9c7abbc 100644
--- a/group_vars/clients.yml.sample
+++ b/group_vars/clients.yml.sample
@@ -58,4 +58,3 @@ dummy:
 #  - { name: client.test2, caps: { mon: "profile rbd", osd: "allow class-read object_prefix rbd_children, profile rbd pool=test2" },  mode: "{{ ceph_keyring_permissions }}" }
 
 #ceph_nfs_ceph_user: { name: client.rgw.nfs0, key: 'SECRET==', caps: { mon: "allow rw", osd: "allow rwx" }, mode: "{{ ceph_keyring_permissions }}" }
-
diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index b37da6031..2d2bcefa2 100644
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -178,4 +178,3 @@ dummy:
 
 #nb_retry_wait_osd_up: 60
 #delay_wait_osd_up: 10
-
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index d10a0f439..01d7b9a40 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -565,8 +565,6 @@ ceph_iscsi_config_dev: false
 ##########
 # DOCKER #
 ##########
-#container_exec_cmd:
-#docker: false
 ceph_docker_image: "rhceph/rhceph-4-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
@@ -833,3 +831,11 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert
 
 #use_fqdn_yes_i_am_sure: false
 
+
+######################################################
+# VARIABLES BELOW SHOULD NOT BE MODIFIED BY THE USER #
+#               *DO NOT* MODIFY THEM                 #
+######################################################
+
+#container_exec_cmd:
+#docker: false
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 940778546..d43372b81 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -557,8 +557,6 @@ ceph_tcmalloc_max_total_thread_cache: 0
 ##########
 # DOCKER #
 ##########
-container_exec_cmd:
-docker: false
 ceph_docker_image: "ceph/daemon"
 ceph_docker_image_tag: latest
 ceph_docker_registry: docker.io
@@ -824,3 +822,12 @@ client_connections: {}
 ###############
 
 use_fqdn_yes_i_am_sure: false
+
+
+######################################################
+# VARIABLES BELOW SHOULD NOT BE MODIFIED BY THE USER #
+#               *DO NOT* MODIFY THEM                 #
+######################################################
+
+container_exec_cmd:
+docker: false
\ No newline at end of file