]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-rgw: fix systemd unit layout 1845/head
authorSébastien Han <seb@redhat.com>
Fri, 1 Sep 2017 17:02:48 +0000 (19:02 +0200)
committerSébastien Han <seb@redhat.com>
Fri, 1 Sep 2017 17:02:48 +0000 (19:02 +0200)
Signed-off-by: Sébastien Han <seb@redhat.com>
roles/ceph-rgw/templates/ceph-radosgw.service.j2

index daaaf6600670da31a347a06689a48d7fe93af341..afe7c72c61701e4620ed842b5a6472fbd693d5a2 100644 (file)
@@ -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 }} \