ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-rgw: fix systemd unit layout 

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1845/head
Sébastien Han 2017-09-01 19:02:48 +02:00
parent 967e875fd0
commit 58f664fd17
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
roles/ceph-rgw/templates/ceph-radosgw.service.j2
View File

@ -18,23 +18,24 @@ ExecStart=/usr/bin/docker run --rm --net=host \
{% if radosgw_address_block | length > 0 %} {% if radosgw_address_block | length > 0 %}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
-e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }} \ -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 }}] \ -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' -%} {% elif hostvars[inventory_hostname]['radosgw_address'] is defined and hostvars[inventory_hostname]['radosgw_address'] != '0.0.0.0' -%}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
-e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname]['radosgw_address'] }} \ -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'] }}] \ -e RGW_CIVETWEB_IP=[{{ hostvars[inventory_hostname]['radosgw_address'] }}] \
{% endif %} {% endif -%}
{%- else -%} {% else -%}
{% set interface = ["ansible_",radosgw_interface]|join %} {% set interface = ["ansible_",radosgw_interface]|join %}
{% if ip_version == 'ipv6' -%} {% if ip_version == 'ipv6' -%}
-e RGW_CIVETWEB_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}] \ -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'] }} \ -e RGW_CIVETWEB_IP={{ hostvars[inventory_hostname][interface][ip_version]['address'] }} \
{% endif %} {% endif -%}
{%- endif %} {% endif -%}
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-e CEPH_DAEMON=RGW \ -e CEPH_DAEMON=RGW \
-e CLUSTER={{ cluster }} \ -e CLUSTER={{ cluster }} \