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

Merge pull request #2167 from ceph/bz-1510906 

defaults: fix rgw restart script in handlers
pull/2170/head
Sébastien Han 2017-11-14 03:37:37 +11:00 committed by GitHub
parent 0369bd59e2 44df3f9102
commit 5cdbb08d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/ceph-defaults/templates/restart_rgw_daemon.sh.j2
View File

@ -16,9 +16,9 @@ RGW_IP=[{{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresse
{% endif %} {% endif %}
{% elif radosgw_address_block is defined and radosgw_address_block != 'subnet' -%} {% elif radosgw_address_block is defined and radosgw_address_block != 'subnet' -%}
{% if ip_version == 'ipv4' %} {% if ip_version == 'ipv4' %}
RGW_IP={{ ['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }} \ RGW_IP={{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }} \
{% elif ip_version == 'ipv6' %} {% elif ip_version == 'ipv6' %}
RGW_IP=[{{ ['ansible_all_' + ip_version + '_addresses'] | ipaddr(radosgw_address_block) | first }}] \ RGW_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'] != 'address' -%} {% elif hostvars[inventory_hostname]['radosgw_address'] is defined and hostvars[inventory_hostname]['radosgw_address'] != 'address' -%}
{% if ip_version == 'ipv4' %} {% if ip_version == 'ipv4' %}
@ -42,9 +42,9 @@ RGW_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}]
{% else %} {% else %}
{% set interface = 'ansible_' + radosgw_interface %} {% set interface = 'ansible_' + radosgw_interface %}
{% if ip_version == 'ipv4' %} {% if ip_version == 'ipv4' %}
RGW_IP={{ [interface][ip_version]['address'] }} \ RGW_IP={{ hostvars[inventory_hostname][interface][ip_version]['address'] }} \
{% elif ip_version == 'ipv6' %} {% elif ip_version == 'ipv6' %}
RGW_IP=[{{ [interface][ip_version][0]['address'] }}] \ RGW_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}] \
{% endif %} {% endif %}
{% endif %} {% endif %}