From: fpantano <fpantano@redhat.com>
Date: Thu, 28 Feb 2019 07:55:48 +0000 (+0100)
Subject: Removed not needed mountpoint and removed ubuntu section
X-Git-Tag: v3.2.8~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1033411512cf34c73891dab9310eaf0fdd087feb;p=ceph-ansible.git

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 <fpantano@redhat.com>
(cherry picked from commit 21fad7ced344e441ffcd5c4010d634b81ead517f)
---

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index ae04f0fcf..862f81da8 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 }} \