From: Sébastien Han <seb@redhat.com>
Date: Fri, 1 Sep 2017 17:02:48 +0000 (+0200)
Subject: ceph-rgw: fix systemd unit layout
X-Git-Tag: v3.0.0rc6~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1845%2Fhead;p=ceph-ansible.git

ceph-rgw: fix systemd unit layout

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index daaaf6600..afe7c72c6 100644
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -18,23 +18,24 @@ ExecStart=/usr/bin/docker run --rm --net=host \
   {% if radosgw_address_block | length > 0 %}
     {% if ip_version == 'ipv4' -%}
   -e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }} \
-    {%- elif ip_version == 'ipv6' -%}
+    {% elif ip_version == 'ipv6' -%}
   -e RGW_CIVETWEB_IP=[{{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }}] \
-    {%- endif %}
+    {% endif -%}
   {% elif hostvars[inventory_hostname]['radosgw_address'] is defined and hostvars[inventory_hostname]['radosgw_address'] != '0.0.0.0' -%}
     {% if ip_version == 'ipv4' -%}
   -e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname]['radosgw_address'] }} \
-    {%- elif ip_version == 'ipv6' -%}
+    {% elif ip_version == 'ipv6' -%}
   -e RGW_CIVETWEB_IP=[{{ hostvars[inventory_hostname]['radosgw_address'] }}] \
-    {% endif %}
-  {%- else -%}
+    {% endif -%}
+  {% else -%}
     {% set interface = ["ansible_",radosgw_interface]|join %}
       {% if ip_version == 'ipv6' -%}
   -e RGW_CIVETWEB_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}] \
-      {%- elif ip_version == 'ipv4' -%}
+      {% elif ip_version == 'ipv4' -%}
   -e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname][interface][ip_version]['address'] }} \
-      {% endif %}
-  {%- endif %}
+      {% endif -%}
+  {% endif -%}
+
   -v /etc/localtime:/etc/localtime:ro \
   -e CEPH_DAEMON=RGW \
   -e CLUSTER={{ cluster }} \