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 <gabrioux@redhat.com>

diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample
index 038bdcf2bbceeb97ce730f41cc760a10f0342045..c94c65d8d3abe26ec3cc62a1de4a36f70c4ef2be 100644 (file)
--- 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 f06ecc3ef277a63ed798d98dbf9b1b5893c1cdeb..b4f764c1411ffe5db6feacdc019e93d1dcfaa4a6 100644 (file)
--- 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 cd7c3ad9541eb68e5068aa5568709d324ab07991..fe22bc894130216b6109e0a38d63b2e20bef142b 100644 (file)
--- 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 1382251b0308eb346278fe1568784dbd83ba212e..bcff078e2d393f994823955df29b4ce7c6b16f87 100644 (file)
--- 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: