From 314d5d8663897f484e3f757502e28d29aef16e0e Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 10 Feb 2020 11:12:01 +1100 Subject: [PATCH 1/4] DCD-937: Move back to NFS v3 as using v4 conflicts with docs and is causing customer confusion. To be revisited later. --- roles/nfs_mount/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml index 9e170e4..fcc6453 100644 --- a/roles/nfs_mount/tasks/main.yml +++ b/roles/nfs_mount/tasks/main.yml @@ -13,5 +13,5 @@ src: "{{ atl_fileserver_host }}:{{ atl_nfs_target }}" path: "{{ atl_nfs_mountpoint }}" fstype: nfs - opts: "rw,nfsvers=4.1,lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" + opts: "rw,nfsvers=3,lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" state: mounted From 084799608322f47963ef56531654972728f6d32f Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 10 Feb 2020 12:05:29 +1100 Subject: [PATCH 2/4] DCD-937: Make NFS version configurable. --- aws_bitbucket_dc_node.yml | 1 + roles/nfs_mount/defaults/main.yml | 1 + roles/nfs_mount/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index d8b67ec..e5c8240 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -12,6 +12,7 @@ atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared" atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared" + atl_nfs_version: "3" atl_startup_systemd_params: - "UMask=0027" diff --git a/roles/nfs_mount/defaults/main.yml b/roles/nfs_mount/defaults/main.yml index 6464ddd..ce2f7a4 100644 --- a/roles/nfs_mount/defaults/main.yml +++ b/roles/nfs_mount/defaults/main.yml @@ -2,3 +2,4 @@ atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}" atl_nfs_target: "{{ atl_shared_mountpoint }}" +atl_nfs_version: "4.1" diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml index fcc6453..3834e8d 100644 --- a/roles/nfs_mount/tasks/main.yml +++ b/roles/nfs_mount/tasks/main.yml @@ -13,5 +13,5 @@ src: "{{ atl_fileserver_host }}:{{ atl_nfs_target }}" path: "{{ atl_nfs_mountpoint }}" fstype: nfs - opts: "rw,nfsvers=3,lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" + opts: "rw,nfsvers={{ atl_nfs_version }},lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" state: mounted From 86a78717614b23c7e60ab8c24c8531b96e737f4b Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 10 Feb 2020 13:13:23 +1100 Subject: [PATCH 3/4] DCD-937: Add retries to NFS mount. --- roles/nfs_mount/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml index 3834e8d..743c670 100644 --- a/roles/nfs_mount/tasks/main.yml +++ b/roles/nfs_mount/tasks/main.yml @@ -15,3 +15,7 @@ fstype: nfs opts: "rw,nfsvers={{ atl_nfs_version }},lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" state: mounted + register: mount_result + until: not mount.failed + retries: 60 + delay: 5 From 12cfe7a9e77c8e8e11598c96a81713822f1693a1 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 10 Feb 2020 13:35:10 +1100 Subject: [PATCH 4/4] DCD-937: Fix var name. --- roles/nfs_mount/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml index 743c670..dfe6a27 100644 --- a/roles/nfs_mount/tasks/main.yml +++ b/roles/nfs_mount/tasks/main.yml @@ -16,6 +16,6 @@ opts: "rw,nfsvers={{ atl_nfs_version }},lookupcache=pos,noatime,intr,rsize=32768,wsize=32768,_netdev" state: mounted register: mount_result - until: not mount.failed + until: not mount_result.failed retries: 60 delay: 5