From 31f4a9153e4e6ba3368114d19f5a11e362ff28aa Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Tue, 25 May 2021 00:48:58 +0200
Subject: [PATCH] Ensures mount uid/git for Manila keyring are correctly set

Like we used to do when configuring Ganesha via puppet [1] this
change is making the new tripleo_ceph_client role set the Manila
keyring mount uid/gid so that Ganesha can correctly map root
permissions from CephFS to NFS.

1. https://github.com/openstack/puppet-tripleo/blob/master/manifests/profile/base/manila/share.pp#L145-L147

Closes-Bug: 1894374
Change-Id: I86b1b75c9d807356e9a1f1901bc7e8856f0c0961
---
 .../roles/tripleo_ceph_client/templates/ceph_conf.j2        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2 b/tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2
index 7dc3e0867..6d389f8ae 100644
--- a/tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2
+++ b/tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2
@@ -40,3 +40,9 @@ mon host = {% if tripleo_ceph_client_mon_ips is defined and tripleo_ceph_client_
 [client.libvirt]
 admin socket = {{ tripleo_ceph_client_rbd_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok
 log file = {{ tripleo_ceph_client_rbd_log_file }}
+
+{% if tripleo_cephadm_ceph_nfs_ceph_user is defined %}
+[client.{{ tripleo_cephadm_ceph_nfs_ceph_user }}]
+client mount uid = 0
+client mount gid = 0
+{% endif %}