]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Removed not needed mountpoint and removed ubuntu section
authorfpantano <fpantano@redhat.com>
Thu, 28 Feb 2019 07:55:48 +0000 (08:55 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Thu, 28 Feb 2019 12:31:23 +0000 (12:31 +0000)
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)

roles/ceph-rgw/templates/ceph-radosgw.service.j2

index ae04f0fcf35f1c0c984acb073d36467beb78e88a..862f81da8f8555bee929519006f2f6ffa5078d39 100644 (file)
@@ -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 }} \