From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 25 Sep 2020 14:44:08 +0000 (-0400)
Subject: ceph-config: remove ceph_release from ceph.conf.j2
X-Git-Tag: v5.0.2~36
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8d49d97582d135660dc3a38e03d42d7f4a52178e;p=ceph-ansible.git

ceph-config: remove ceph_release from ceph.conf.j2

We don't use ceph_release variable in the ceph.conf jinja template.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 62bd41f0d4e20d73793d8e8d6a8db722aac146c2)
---

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index b15068832..e6f7a8e04 100644
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -20,7 +20,6 @@ osd crush chooseleaf type = 0
 {% set nb_client = groups.get(client_group_name, []) | length | int %}
 {% set nb_osd = groups.get(osd_group_name, []) | length | int %}
 {% if inventory_hostname in groups.get(client_group_name, []) and not inventory_hostname == groups.get(client_group_name, []) | first %}
-{% set ceph_release = hostvars[groups[client_group_name][0]]['ceph_release'] %}
 {% endif %}
 
 {% if nb_mon > 0 and inventory_hostname in groups.get(mon_group_name, []) %}