ITOPS-2059 using more lookups, which I may not need to be using if we're already using ansible-with-atl-env

This commit is contained in:
Geoff Jacobs
2019-08-21 12:00:23 +10:00
parent ceba8d47ba
commit aa62a02b6d
3 changed files with 7 additions and 4 deletions

View File

@@ -1,2 +1,5 @@
--- ---
efs_target: "{{ atl_efs_id }}" 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' }}"

View File

@@ -9,7 +9,7 @@
- name: Enable mountpoint in fstab - name: Enable mountpoint in fstab
mount: mount:
path: "{{ atl_shared_mountpoint }}" path: "{{ atl_shared_mountpoint }}"
src: "{{ efs_target }}:/" src: "{{ efs_target }}:{{ efs_src_dir }}"
fstype: efs fstype: "{{ efs_type }}"
opts: "defaults,_netdev" opts: "{{ efs_mount_options }}"
state: mounted state: mounted

View File

@@ -27,7 +27,7 @@
insertafter: "EOF" insertafter: "EOF"
line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"' line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
- name: Set JAVA_HOME - name: Set JAVA_HOME #FIXME
lineinfile: lineinfile:
path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh" path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh"
insertafter: "EOF" insertafter: "EOF"