From 77d5d128c3587f00a0f86812cbe1b242083511fb Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 26 Oct 2018 11:14:12 +0200 Subject: [PATCH] rgw: add a dedicated variable for multisite endpoint We should give users the possibility to set the IP they want as multisite endpoint, setting the default value to `{{ ansible_fqdn }}` to not force them to set this variable. Signed-off-by: Guillaume Abrioux --- group_vars/rgws.yml.sample | 1 + roles/ceph-rgw/defaults/main.yml | 1 + roles/ceph-rgw/tasks/multisite/master.yml | 4 ++-- roles/ceph-rgw/tasks/multisite/secondary.yml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index 038bdcf2b..c94c65d8d 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -62,6 +62,7 @@ dummy: #rgw_zonemaster: true #rgw_zonesecondary: false +#rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" #rgw_zonegroup: dummy # should be set by the user #rgw_zone_user: zone.user #rgw_realm: dummy # should be set by the user diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index f06ecc3ef..b4f764c14 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -54,6 +54,7 @@ rgw_zone: default rgw_zonemaster: true rgw_zonesecondary: false +rgw_multisite_endpoint_addr: "{{ ansible_fqdn }}" #rgw_zonegroup: dummy # should be set by the user #rgw_zone_user: zone.user #rgw_realm: dummy # should be set by the user diff --git a/roles/ceph-rgw/tasks/multisite/master.yml b/roles/ceph-rgw/tasks/multisite/master.yml index cd7c3ad95..fe22bc894 100644 --- a/roles/ceph-rgw/tasks/multisite/master.yml +++ b/roles/ceph-rgw/tasks/multisite/master.yml @@ -7,14 +7,14 @@ - "'No such file or directory' in realmcheck.stderr" - name: create the zonegroup - command: radosgw-admin zonegroup create --rgw-zonegroup={{ rgw_zonegroup }} --endpoints=http://{{ ansible_hostname }}:{{ radosgw_frontend_port }} --master --default + command: radosgw-admin zonegroup create --rgw-zonegroup={{ rgw_zonegroup }} --endpoints=http://{{ rgw_multisite_endpoint_addr }}:{{ radosgw_frontend_port }} --master --default delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true when: - "'No such file or directory' in zonegroupcheck.stderr" - name: create the zone - command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_hostname }}:{{ radosgw_frontend_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default --master + command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ rgw_multisite_endpoint_addr }}:{{ radosgw_frontend_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default --master delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true when: diff --git a/roles/ceph-rgw/tasks/multisite/secondary.yml b/roles/ceph-rgw/tasks/multisite/secondary.yml index 1382251b0..bcff078e2 100644 --- a/roles/ceph-rgw/tasks/multisite/secondary.yml +++ b/roles/ceph-rgw/tasks/multisite/secondary.yml @@ -24,7 +24,7 @@ run_once: true - name: create the zone - command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_hostname }}:{{ radosgw_frontend_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default + command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ rgw_multisite_endpoint_addr }}:{{ radosgw_frontend_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true when: -- 2.39.5