From: Chris Wells <chris@nexcess.net>
Date: Mon, 26 Dec 2016 02:54:13 +0000 (-0500)
Subject: Allowing granular control of the pull host/port/protocol for installs where SSL/443... 
X-Git-Tag: v2.2.0rc1~71^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5f37ae9d1f976dbd2063d593520ef4f074a76ed6;p=ceph-ansible.git

Allowing granular control of the pull host/port/protocol for installs where SSL/443 is used and direct civetweb access isn't necessarily available.
---

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index 9bf33a86a..12072b8de 100644
--- 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 90dd03225..a83307fdb 100644
--- 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: