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 a234338eff)
pull/4854/head
Guillaume Abrioux 2019-12-09 18:31:52 +01:00 committed by Dimitri Savineau
parent 6295a33912
commit 00bdb60663
5 changed files with 25 additions and 8 deletions

View File

@ -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

View File

@ -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 }}" }

View File

@ -178,4 +178,3 @@ dummy:
#nb_retry_wait_osd_up: 60
#delay_wait_osd_up: 10

View File

@ -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

View File

@ -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