From 6ff027db8f6c8188371e6151a529d2f403bce719 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 21 Dec 2017 10:19:22 +0100 Subject: [PATCH] rgw: disable legacy rgw service unit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When upgrading from OSP11 to OSP12 container, ceph-ansible attempts to disable the RGW service provided by the overcloud image. The task attempts to stop/disable ceph-rgw@{{ ansible-hostname }} and ceph-radosgw@{{ ansible-hostname }}.service. The actual service name is ceph-radosgw@radosgw.$name Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1525209 Signed-off-by: Sébastien Han (cherry picked from commit ad54e19262f3d523ad57ee39e64d6927b0c21dea) Signed-off-by: Sébastien Han --- roles/ceph-rgw/tasks/docker/start_docker_rgw.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml index d81a6c669..a9968c523 100644 --- a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml +++ b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml @@ -9,7 +9,7 @@ mode: "0644" # For backward compatibility -- name: disable old systemd unit ('ceph-rgw@') if present +- name: disable old systemd unit ('ceph-rgw@'|'ceph-radosgw@radosgw.'|'ceph-radosgw@') if present systemd: name: "{{ item }}" state: stopped @@ -18,6 +18,7 @@ with_items: - "ceph-rgw@{{ ansible_hostname }}" - "ceph-radosgw@{{ ansible_hostname }}.service" + - "ceph-radosgw@radosgw.{{ ansible_hostname }}.service" ignore_errors: true - name: systemd start rgw container -- 2.39.5