ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 ca77d7bd31)
pull/4487/head
Dimitri Savineau 2019-09-26 12:44:03 -04:00 committed by Guillaume Abrioux
parent 21e1650db6
commit 2d1372fe2a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/nfss.yml.sample
View File

@ -79,6 +79,7 @@ dummy:
#ceph_nfs_ceph_access_type: "RW" #ceph_nfs_ceph_access_type: "RW"
#ceph_nfs_ceph_user: "admin" #ceph_nfs_ceph_user: "admin"
#ceph_nfs_ceph_squash: "Root_Squash" #ceph_nfs_ceph_squash: "Root_Squash"
#ceph_nfs_ceph_sectype: "sys,krb5,krb5i,krb5p"
################### ###################
# FSAL RGW Config # # FSAL RGW Config #
@ -89,6 +90,7 @@ dummy:
#ceph_nfs_rgw_access_type: "RW" #ceph_nfs_rgw_access_type: "RW"
#ceph_nfs_rgw_user: "cephnfs" #ceph_nfs_rgw_user: "cephnfs"
#ceph_nfs_rgw_squash: "Root_Squash" #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 # Note: keys are optional and can be generated, but not on containerized, where
# they must be configered. # they must be configered.
#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY" #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"

2
roles/ceph-nfs/defaults/main.yml
View File

@ -71,6 +71,7 @@ ceph_nfs_ceph_protocols: "3,4"
ceph_nfs_ceph_access_type: "RW" ceph_nfs_ceph_access_type: "RW"
ceph_nfs_ceph_user: "admin" ceph_nfs_ceph_user: "admin"
ceph_nfs_ceph_squash: "Root_Squash" ceph_nfs_ceph_squash: "Root_Squash"
ceph_nfs_ceph_sectype: "sys,krb5,krb5i,krb5p"
################### ###################
# FSAL RGW Config # # FSAL RGW Config #
@ -81,6 +82,7 @@ ceph_nfs_rgw_protocols: "3,4"
ceph_nfs_rgw_access_type: "RW" ceph_nfs_rgw_access_type: "RW"
ceph_nfs_rgw_user: "cephnfs" ceph_nfs_rgw_user: "cephnfs"
ceph_nfs_rgw_squash: "Root_Squash" 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 # Note: keys are optional and can be generated, but not on containerized, where
# they must be configered. # they must be configered.
#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY" #ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"

4
roles/ceph-nfs/templates/ganesha.conf.j2
View File

@ -57,7 +57,7 @@ EXPORT
Transports = TCP; Transports = TCP;
SecType = sys,krb5,krb5i,krb5p; SecType = {{ ceph_nfs_ceph_sectype }};
Squash = {{ ceph_nfs_ceph_squash }}; Squash = {{ ceph_nfs_ceph_squash }};
@ -86,7 +86,7 @@ EXPORT
Transports = TCP; Transports = TCP;
SecType = sys,krb5,krb5i,krb5p; SecType = {{ ceph_nfs_rgw_sectype }};
Squash = {{ ceph_nfs_rgw_squash }}; Squash = {{ ceph_nfs_rgw_squash }};