ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rgw: avoid useless call to ceph-rgw 

since `ceph-rgw` may be called from `ceph-handler` in some contexts we
should avoid rerunning it unnecessarily.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 8617081664)
pull/6226/head v4.0.44
Guillaume Abrioux 2021-01-27 18:36:13 +01:00 committed by Dimitri Savineau
parent b903446fa4
commit aeee3471e3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/ceph-handler/tasks/main.yml
View File

@ -68,4 +68,10 @@
import_role:
name: ceph-rgw
tasks_from: multisite.yml
when: rgw_multisite | bool
when:
- rgw_multisite | bool
- not multisite_called_from_handler_role | default(False) | bool
- name: set_fact multisite_called_from_handler_role
set_fact:
multisite_called_from_handler_role: true

4
roles/ceph-rgw/tasks/main.yml
View File

@ -29,4 +29,6 @@
- name: include_tasks multisite/main.yml
include_tasks: multisite/main.yml
when: rgw_multisite | bool
when:
- rgw_multisite | bool
- not multisite_called_from_handler_role | default(False) | bool