From: Sébastien Han <sebastien.han@enovance.com>
Date: Sun, 15 Feb 2015 01:21:27 +0000 (+0100)
Subject: Improve RGW config section
X-Git-Tag: v1.0.0~255^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0095b34c88a35d6b23be5e23ace9c2af0f267336;p=ceph-ansible.git

Improve RGW config section

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 <sebastien.han@enovance.com>
---

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 %}