From 290d3ef369029d066aadc3b49f36232c5a9dacd2 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 6 Jan 2021 10:37:12 +0100 Subject: [PATCH] rgw: support switching from single-site to multisite When collocating rgw with either a mon, mgr or osd, switching from single site to a multisite rgw setup failed because of the handlers triggered between the ansible play of the collocated daemon and the play of the rgw. Since the multisite changes are not yet applied the handlers fail. The idea here is to ensure we run the multisite configuration from the ceph-handler role before the restart happens, this way it won't complain because of non existing multisite configuration. (Note: this is also valid when simply changing a multisite configuration) Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1888630 Signed-off-by: Guillaume Abrioux (cherry picked from commit 513c8cfe551da78ea89d2513dffebd9649bfeb44) --- roles/ceph-handler/tasks/main.yml | 6 ++++++ roles/ceph-rgw/tasks/multisite.yml | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 roles/ceph-rgw/tasks/multisite.yml diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml index 85ae311a1..c7b323e78 100644 --- a/roles/ceph-handler/tasks/main.yml +++ b/roles/ceph-handler/tasks/main.yml @@ -63,3 +63,9 @@ name: ceph-rgw tasks_from: pre_requisite.yml when: not containerized_deployment | bool + + - name: import_role ceph-rgw + import_role: + name: ceph-rgw + tasks_from: multisite.yml + when: rgw_multisite | bool diff --git a/roles/ceph-rgw/tasks/multisite.yml b/roles/ceph-rgw/tasks/multisite.yml new file mode 100644 index 000000000..8ccc6c04a --- /dev/null +++ b/roles/ceph-rgw/tasks/multisite.yml @@ -0,0 +1,3 @@ +--- +- name: include_tasks multisite + include_tasks: multisite/main.yml \ No newline at end of file