From: John Fulton <fulton@redhat.com>
Date: Wed, 9 Aug 2017 21:07:40 +0000 (-0400)
Subject: Set file mode permission of Ceph keyrings
X-Git-Tag: opnfv-6.0.0~255^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6d1c06c6b8cbc1f183fe4de794d30d3000218237;p=apex-tripleo-heat-templates.git

Set file mode permission of Ceph keyrings

Pass mode parameter to ceph-ansible in place of ACLs parameter
because ACLs are not for same UID in container as container host
and because ACLs are not passed by kolla_config.

Change-Id: I7e3433eab8e2a62963b623531f223d5abd301d16
Closes-Bug: #1709683
---

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 85fe0608..f6601212 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -186,11 +186,7 @@ outputs:
                  CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
                  GLANCE_POOL: {get_param: GlanceRbdPoolName}
                  GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
-            acls:
-            - "u:glance:r--"
-            - "u:nova:r--"
-            - "u:cinder:r--"
-            - "u:gnocchi:r--"
+            mode: "0644"
           keys: *openstack_keys
           pools: []
           ceph_conf_overrides: