diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 43534d4cca..e1a4d129b7 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -48,3 +48,6 @@ nrpe_procs_crit: 200 # env is staging or production, we default it to production here. env: production + +# nfs mount options, override at the group/host level +nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid" diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index f32aae17ff..5950013e90 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -23,3 +23,5 @@ fedmsg_certs: - service: mediawiki owner: root group: apache + +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki-stg index f32aae17ff..5950013e90 100644 --- a/inventory/group_vars/wiki-stg +++ b/inventory/group_vars/wiki-stg @@ -23,3 +23,5 @@ fedmsg_certs: - service: mediawiki owner: root group: apache + +nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid" diff --git a/roles/nfs_client/tasks/main.yml b/roles/nfs_client/tasks/main.yml index a6e389cf94..10712880f9 100644 --- a/roles/nfs_client/tasks/main.yml +++ b/roles/nfs_client/tasks/main.yml @@ -28,7 +28,7 @@ name=/mnt/{{ mnt_dir }} src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/{{ nfs_src_dir }} fstype=nfs - opts=ro,hard,bg,intr,noatime,nodev,nosuid + opts={{nfs_mount_opts}} passno=0 dump=0 state=mounted