From 56f4f8db3758c93499dc2a45502200bf7a243154 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 6 Jun 2019 15:37:37 +1000
Subject: [PATCH] DCD-386: The BB node mounts NFS deeper in the FS.

---
 aws_bitbucket_dc_node.yml         | 4 ++++
 roles/nfs_mount/defaults/main.yml | 4 ++++
 roles/nfs_mount/tasks/main.yml    | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 roles/nfs_mount/defaults/main.yml

diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 0f97654..3108bf8 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -8,6 +8,10 @@
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
 
+    atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared"
+    atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared"
+
+
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
diff --git a/roles/nfs_mount/defaults/main.yml b/roles/nfs_mount/defaults/main.yml
new file mode 100644
index 0000000..6464ddd
--- /dev/null
+++ b/roles/nfs_mount/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+
+atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}"
+atl_nfs_target: "{{ atl_shared_mountpoint }}"
diff --git a/roles/nfs_mount/tasks/main.yml b/roles/nfs_mount/tasks/main.yml
index 19abff9..9e170e4 100644
--- a/roles/nfs_mount/tasks/main.yml
+++ b/roles/nfs_mount/tasks/main.yml
@@ -10,8 +10,8 @@
 
 - name: Enable mountpoint in fstab
   mount:
-    path: "{{ atl_shared_mountpoint }}"
-    src: "{{ atl_fileserver_host }}:{{ atl_shared_mountpoint }}"
+    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"
     state: mounted