From c2e04623a54007674ec60647a9e5ddd2da4f991b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 9 Jan 2018 14:34:09 +0100 Subject: [PATCH] container: change the way we force no logs inside the container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- roles/ceph-config/templates/ceph.conf.j2 | 1 + roles/ceph-docker-common/defaults/main.yml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) 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