From deda26fd20fe2bf927b4278267caa672dc003753 Mon Sep 17 00:00:00 2001 From: fpantano Date: Thu, 28 Feb 2019 08:55:48 +0100 Subject: [PATCH] Removed not needed mountpoint and removed ubuntu section Referring to BZ#1683290, as dsavineau suggests, being this bug tripleO specific, removed the ubuntu section and removed useless mountpoints. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1683290 Signed-off-by: fpantano (cherry picked from commit 21fad7ced344e441ffcd5c4010d634b81ead517f) --- roles/ceph-rgw/templates/ceph-radosgw.service.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 index ae04f0fcf3..862f81da8f 100644 --- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 +++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 @@ -24,10 +24,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \ {% endif -%} -v /etc/localtime:/etc/localtime:ro \ {% if ansible_distribution == 'RedHat' -%} - -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro \ - -v /etc/pki/ca-trust/source/anchors:/etc/pki/ca-trust/source/anchors:ro \ - {% elif ansible_distribution == 'Ubuntu' -%} - -v /etc/ssl/certs:/etc/ssl/certs:ro \ + -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:z \ {% endif -%} -e CEPH_DAEMON=RGW \ -e CLUSTER={{ cluster }} \