stable-2.2: Fix nfs-ganesha configuration template

The ganesha.conf template included several parameters that were wrong.

- Change NFS_Protocols to Protocols
- Change Transport_Protocols to Transports

In addition, change capitalization of other configuration options in
order to be in line with what
https://github.com/nfs-ganesha/nfs-ganesha/blob/master/src/config_samples/config.txt says.

Fixed #1909.

diff --git a/roles/ceph-common/templates/ganesha.conf.j2 b/roles/ceph-common/templates/ganesha.conf.j2
index 0c661b3d33804f5b7c15e23d3291ed3a84965abe..17e2381ddbd2035955b58f12032c04bfac1ffea3 100644 (file)
--- a/roles/ceph-common/templates/ganesha.conf.j2
+++ b/roles/ceph-common/templates/ganesha.conf.j2
@@ -4,7 +4,7 @@
 {% if nfs_file_gw %}
 EXPORT
 {
-       Export_ID={{ ceph_nfs_ceph_export_id }};
+       Export_id={{ ceph_nfs_ceph_export_id }};
 
        Path = "/";
 
@@ -12,11 +12,11 @@ EXPORT
 
        Access_Type = {{ ceph_nfs_ceph_access_type }};
 
-       NFS_Protocols = {{ ceph_nfs_ceph_protocols }};
+       Protocols = {{ ceph_nfs_ceph_protocols }};
 
-       Transport_Protocols = TCP;
+       Transports = TCP;
 
-       Sectype = sys,krb5,krb5i,krb5p;
+       SecType = sys,krb5,krb5i,krb5p;
 
        FSAL {
                Name = CEPH;
@@ -26,7 +26,7 @@ EXPORT
 {% if nfs_obj_gw %}
 EXPORT
 {
-       Export_ID={{ ceph_nfs_rgw_export_id }};
+       Export_id={{ ceph_nfs_rgw_export_id }};
 
        Path = "/";
 
@@ -34,11 +34,11 @@ EXPORT
 
        Access_Type = {{ ceph_nfs_rgw_access_type }};
 
-       NFS_Protocols = {{ ceph_nfs_rgw_protocols }};
+       Protocols = {{ ceph_nfs_rgw_protocols }};
 
-       Transport_Protocols = TCP;
+       Transports = TCP;
 
-       Sectype = sys,krb5,krb5i,krb5p;
+       SecType = sys,krb5,krb5i,krb5p;
 
        FSAL {
                Name = RGW;