Updated pull[port|proto] to pull_[port|proto] and regenerated base group vars

diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample
index 4e193e01821a0b6e249e5a34e2e2be6d23bd747b..a32c9f63213d1afb7d2d1864c79af193353bc190 100644 (file)
--- a/group_vars/rgws.yml.sample
+++ b/group_vars/rgws.yml.sample
@@ -30,6 +30,10 @@ dummy:
 # 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/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index 12072b8deb6f31dd071d20f90661591f7f839b10..9ae24da3fceee5e0648e28c3ee8dbb35060c7898 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -23,8 +23,8 @@ cephx: true
 radosgw_user: root
 
 # Multi-site remote pull URL variables
-rgw_pullport: "{{ radosgw_civetweb_port }}"
-rgw_pullproto: "http"
+rgw_pull_port: "{{ radosgw_civetweb_port }}"
+rgw_pull_proto: "http"
 
 ##########
 # DOCKER #

diff --git a/roles/ceph-rgw/tasks/multisite/secondary.yml b/roles/ceph-rgw/tasks/multisite/secondary.yml
index a83307fdb7d2dac60cd3b89496a8e65d67a26194..7623e832c3f9ec0a5fbafbb396e348555b8d00a5 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={{ rgw_pullproto }}://{{ rgw_pullhost }}:{{ rgw_pullport }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
+  command: radosgw-admin realm pull --url={{ rgw_pull_proto }}://{{ rgw_pullhost }}:{{ rgw_pull_port }} --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={{ rgw_pullproto }}://{{ rgw_pullhost }}:{{ rgw_pullport }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
+  command: radosgw-admin period pull --url={{ rgw_pull_proto }}://{{ rgw_pullhost }}:{{ rgw_pull_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
   when: ("No such file or directory" in realmcheck.stderr)
   notify: