From aa62a02b6d0b2adab60a758339ce3aebb8873e17 Mon Sep 17 00:00:00 2001
From: Geoff Jacobs <gjacobs@atlassian.com>
Date: Wed, 21 Aug 2019 12:00:23 +1000
Subject: [PATCH] ITOPS-2059 using more lookups, which I may not need to be
 using if we're already using ansible-with-atl-env

---
 roles/aws_efs_config/defaults/main.yml | 3 +++
 roles/aws_efs_config/tasks/main.yml    | 6 +++---
 roles/crowd_config/tasks/main.yml      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/aws_efs_config/defaults/main.yml b/roles/aws_efs_config/defaults/main.yml
index 26c397f..06c8177 100644
--- a/roles/aws_efs_config/defaults/main.yml
+++ b/roles/aws_efs_config/defaults/main.yml
@@ -1,2 +1,5 @@
 ---
 efs_target: "{{ atl_efs_id }}"
+efs_type: "{{ lookup('env', 'ATL_EFS_TYPE') or 'efs' }}"
+efs_src_dir: "{{ lookup('env', 'ATL_EFS_SRC_DIR') or '/' }}"
+efs_mount_options: "{{ lookup('env', 'ATL_EFS_MOUNT_OPTIONS') or 'defaults,_netdev' }}"
\ No newline at end of file
diff --git a/roles/aws_efs_config/tasks/main.yml b/roles/aws_efs_config/tasks/main.yml
index df8ca09..589383c 100644
--- a/roles/aws_efs_config/tasks/main.yml
+++ b/roles/aws_efs_config/tasks/main.yml
@@ -9,7 +9,7 @@
 - name: Enable mountpoint in fstab
   mount:
     path: "{{ atl_shared_mountpoint }}"
-    src: "{{ efs_target }}:/"
-    fstype: efs
-    opts: "defaults,_netdev"
+    src: "{{ efs_target }}:{{ efs_src_dir }}"
+    fstype: "{{ efs_type }}"
+    opts: "{{ efs_mount_options }}"
     state: mounted
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index cd59fb6..fc21565 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -27,7 +27,7 @@
     insertafter: "EOF"
     line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
 
-- name: Set JAVA_HOME
+- name: Set JAVA_HOME #FIXME
   lineinfile:
     path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh"
     insertafter: "EOF"