From 0095b34c88a35d6b23be5e23ace9c2af0f267336 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Sun, 15 Feb 2015 02:21:27 +0100 Subject: [PATCH] Improve RGW config section MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use hostname in socket and log. Improve jinja template so when a var doesn't exist we don't indent the next line. Signed-off-by: Sébastien Han --- roles/ceph-common/templates/ceph.conf.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 802954f82..d8700bee2 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -1,3 +1,4 @@ +#jinja2: trim_blocks: "true", lstrip_blocks: "true" # {{ ansible_managed }} [global] @@ -140,8 +141,8 @@ {% endif %} host = {{ hostvars[host]['ansible_hostname'] }} keyring = /etc/ceph/radosgw.gateway.keyring - rgw socket path = /tmp/radosgw.sock - log file = /var/log/ceph/radosgw.log + rgw socket path = /tmp/radosgw-{{ hostvars[host]['ansible_hostname'] }}.sock + log file = /var/log/ceph/radosgw-{{ hostvars[host]['ansible_hostname'] }}.log rgw data = /var/lib/ceph/radosgw/{{ hostvars[host]['ansible_hostname'] }} rgw print continue = false {% endif %} -- 2.39.5