From a234338eff4b4e35e1c0504ae2ee005e4ca76cf7 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>
---
 group_vars/all.yml.sample             | 10 ++++++++--
 group_vars/rhcs.yml.sample            | 10 ++++++++--
 roles/ceph-defaults/defaults/main.yml | 11 +++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 46ce61a24..3a846926a 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -567,8 +567,6 @@ dummy:
 ##########
 # DOCKER #
 ##########
-#container_exec_cmd:
-#docker: false
 #ceph_docker_image: "ceph/daemon"
 #ceph_docker_image_tag: latest
 #ceph_docker_registry: docker.io
@@ -835,3 +833,11 @@ dummy:
 
 #use_fqdn_yes_i_am_sure: false
 
+
+######################################################
+# VARIABLES ABOVE SHOULD NOT BE MODIFIED BY THE USER #
+#               *DO NOT* MODIFY THEM                 #
+######################################################
+
+#container_exec_cmd:
+#docker: false
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index bead0d204..49feb3d25 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -567,8 +567,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"
@@ -835,3 +833,11 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert
 
 #use_fqdn_yes_i_am_sure: false
 
+
+######################################################
+# VARIABLES ABOVE 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 dca085ef4..dff9beb67 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -559,8 +559,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
@@ -826,3 +824,12 @@ client_connections: {}
 ###############
 
 use_fqdn_yes_i_am_sure: false
+
+
+######################################################
+# VARIABLES ABOVE SHOULD NOT BE MODIFIED BY THE USER #
+#               *DO NOT* MODIFY THEM                 #
+######################################################
+
+container_exec_cmd:
+docker: false
\ No newline at end of file