From d609dca7a6ce97f7f87b9f2bc5f98fbe95ead284 Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Sat, 7 Jan 2017 09:33:24 -0500 Subject: [PATCH] Updated pull[port|proto] to pull_[port|proto] and regenerated base group vars --- group_vars/rgws.yml.sample | 4 ++++ roles/ceph-rgw/defaults/main.yml | 4 ++-- roles/ceph-rgw/tasks/multisite/secondary.yml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index 4e193e018..a32c9f632 100644 --- 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 12072b8de..9ae24da3f 100644 --- 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 a83307fdb..7623e832c 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={{ 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: -- 2.39.5