From 8e1339eeaec4ee781f94e6c20d315712b183187f Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Tue, 11 Feb 2025 19:36:16 +0100 Subject: [PATCH] common/container: drop CEPH_USE_RANDOM_NONCE env var It is not necessary anymore as this behavior became the default one. Ceph Ref. https://github.com/ceph/ceph/pull/50344 Signed-off-by: Seena Fallah (cherry picked from commit 5b11adade2153732cec0759918b0dee52063f978) --- group_vars/all.yml.sample | 1 - roles/ceph-defaults/defaults/main.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 554cb7107..758046421 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -529,7 +529,6 @@ dummy: #ceph_common_container_params: # envs: # NODE_NAME: "{{ ansible_facts['hostname'] }}" -# CEPH_USE_RANDOM_NONCE: "1" # 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: diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index d418e38f1..938ef521b 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -521,7 +521,6 @@ timeout_command: "{{ 'timeout --foreground -s KILL ' ~ docker_pull_timeout if (d ceph_common_container_params: envs: NODE_NAME: "{{ ansible_facts['hostname'] }}" - CEPH_USE_RANDOM_NONCE: "1" 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: -- 2.39.5