Allowing granular control of the pull host/port/protocol for installs where SSL/443...

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index 9bf33a86a42914e59ae42b1d80fe73855ae27142..12072b8deb6f31dd071d20f90661591f7f839b10 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -22,6 +22,10 @@ cephx: true
 # allowing root to not require tty
 radosgw_user: root
 
+# Multi-site remote pull URL variables
+rgw_pullport: "{{ radosgw_civetweb_port }}"
+rgw_pullproto: "http"
+
 ##########
 # DOCKER #
 ##########

diff --git a/roles/ceph-rgw/tasks/multisite/secondary.yml b/roles/ceph-rgw/tasks/multisite/secondary.yml
index 90dd03225457b971eb8d9f1eea7826f36aeaa8a6..a83307fdb7d2dac60cd3b89496a8e65d67a26194 100644 (file)
--- a/roles/ceph-rgw/tasks/multisite/secondary.yml
+++ b/roles/ceph-rgw/tasks/multisite/secondary.yml
@@ -1,13 +1,13 @@
 ---
 - name: fetch the realm
-  command: radosgw-admin realm pull --url=http://{{ rgw_pullhost }}:{{ radosgw_civetweb_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
+  command: radosgw-admin realm pull --url={{ rgw_pullproto }}://{{ rgw_pullhost }}:{{ rgw_pullport }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
   when: ("No such file or directory" in realmcheck.stderr)
   notify:
     - update period
 
 - name: fetch the period
-  command: radosgw-admin period pull --url=http://{{ rgw_pullhost }}:{{ radosgw_civetweb_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
+  command: radosgw-admin period pull --url={{ rgw_pullproto }}://{{ rgw_pullhost }}:{{ rgw_pullport }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
   when: ("No such file or directory" in realmcheck.stderr)
   notify: