From: Sébastien Han <seb@redhat.com>
Date: Tue, 9 Jan 2018 13:34:09 +0000 (+0100)
Subject: container: change the way we force no logs inside the container
X-Git-Tag: v3.1.0beta3~62
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2e04623a54007674ec60647a9e5ddd2da4f991b;p=ceph-ansible.git

container: change the way we force no logs inside the container

Previously we were using ceph_conf_overrides however this doesn't play
nice for softwares like TripleO that uses ceph_conf_overrides inside its
own code. For now, and since this is the only occurence of this, we can
ensure no logs through the ceph conf template.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1532619
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index 3ca5f323d..57a1df06e 100644
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -74,6 +74,7 @@ mon host = {% if nb_mon > 0 %}
 
 {% if containerized_deployment %}
 fsid = {{ fsid }}
+log file = /dev/null
 mon host = {% if nb_mon > 0 %}
 {% for host in groups[mon_group_name] -%}
     {% if monitor_address_block != 'subnet' %}
diff --git a/roles/ceph-docker-common/defaults/main.yml b/roles/ceph-docker-common/defaults/main.yml
index c9a5ea514..ed97d539c 100644
--- a/roles/ceph-docker-common/defaults/main.yml
+++ b/roles/ceph-docker-common/defaults/main.yml
@@ -1,4 +1 @@
 ---
-ceph_conf_overrides:
-  global:
-    log_file: /dev/null