ceph-nfs: Allow to configure SecType value

Depending on the infrastruture (w/o kerberos auth) then the SecType
value could be different.
Currently this value is hardcoded in the NFS Ganesha template. Instead
we can use a variable.
The default value is still the same to avoid breaking the backward
compatibility.

Closes: #4459
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit ca77d7bd317da75404ef4ee7143c7412d6ae63ee)

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index 6b60d84222a7be4b5eac6f72608e252d90b2258f..e3820bdb72f5a764ff851d768acbad031299c016 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -79,6 +79,7 @@ dummy:
 #ceph_nfs_ceph_access_type: "RW"
 #ceph_nfs_ceph_user: "admin"
 #ceph_nfs_ceph_squash: "Root_Squash"
+#ceph_nfs_ceph_sectype: "sys,krb5,krb5i,krb5p"
 
 ###################
 # FSAL RGW Config #
@@ -89,6 +90,7 @@ dummy:
 #ceph_nfs_rgw_access_type: "RW"
 #ceph_nfs_rgw_user: "cephnfs"
 #ceph_nfs_rgw_squash: "Root_Squash"
+#ceph_nfs_rgw_sectype: "sys,krb5,krb5i,krb5p"
 # Note: keys are optional and can be generated, but not on containerized, where
 # they must be configered.
 #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index 94823bf73f6470af4b0cb7ecf75ad9ca511bbdb4..adc9f5b14b5911cb27b600dddba525ee2756b669 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -71,6 +71,7 @@ ceph_nfs_ceph_protocols: "3,4"
 ceph_nfs_ceph_access_type: "RW"
 ceph_nfs_ceph_user: "admin"
 ceph_nfs_ceph_squash: "Root_Squash"
+ceph_nfs_ceph_sectype: "sys,krb5,krb5i,krb5p"
 
 ###################
 # FSAL RGW Config #
@@ -81,6 +82,7 @@ ceph_nfs_rgw_protocols: "3,4"
 ceph_nfs_rgw_access_type: "RW"
 ceph_nfs_rgw_user: "cephnfs"
 ceph_nfs_rgw_squash: "Root_Squash"
+ceph_nfs_rgw_sectype: "sys,krb5,krb5i,krb5p"
 # Note: keys are optional and can be generated, but not on containerized, where
 # they must be configered.
 #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"

diff --git a/roles/ceph-nfs/templates/ganesha.conf.j2 b/roles/ceph-nfs/templates/ganesha.conf.j2
index 5c9f25f9de13f706a5b79c9263d0d008e11889b8..9ac40126d6b831a0e60a6b49f61adf2ddd71c54f 100644 (file)
--- a/roles/ceph-nfs/templates/ganesha.conf.j2
+++ b/roles/ceph-nfs/templates/ganesha.conf.j2
@@ -57,7 +57,7 @@ EXPORT
 
        Transports = TCP;
 
-       SecType = sys,krb5,krb5i,krb5p;
+       SecType = {{ ceph_nfs_ceph_sectype }};
 
        Squash = {{ ceph_nfs_ceph_squash }};
 
@@ -86,7 +86,7 @@ EXPORT
 
        Transports = TCP;
 
-       SecType = sys,krb5,krb5i,krb5p;
+       SecType = {{ ceph_nfs_rgw_sectype }};
 
        Squash = {{ ceph_nfs_rgw_squash }};