]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Added to the ceph-radosgw service template the ca-trust
authorfpantano <fpantano@redhat.com>
Tue, 26 Feb 2019 18:51:05 +0000 (19:51 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Thu, 28 Feb 2019 12:31:23 +0000 (12:31 +0000)
volume avoiding to expose useless information.
This bug is referred to the following bugzilla:

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1683290
Signed-off-by: fpantano <fpantano@redhat.com>
(cherry picked from commit 0c1944236bfb397e9dff6ef436569556bc00379d)

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

index 98b6344d3f661b4bfef92226fd8e10e0ade0c6e5..ae04f0fcf35f1c0c984acb073d36467beb78e88a 100644 (file)
@@ -23,6 +23,12 @@ ExecStart=/usr/bin/docker run --rm --net=host \
   -e KV_PORT={{ kv_port }} \
   {% 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 \
+  {% endif -%}
   -e CEPH_DAEMON=RGW \
   -e CLUSTER={{ cluster }} \
   --name=ceph-rgw-{{ ansible_hostname }} \