From d5ed36e4885eea722a3001c821847d79b0a2f97c Mon Sep 17 00:00:00 2001 From: dbacon Date: Wed, 22 Jul 2020 14:29:52 +0100 Subject: [PATCH] AZURE-211 Determine Java Home for an Ubuntu Crowd deployment --- group_vars/all.yml | 2 -- .../molecule/default/playbook.yml | 1 + roles/az_common/handlers/main.yml | 1 - .../az_common/molecule/default/tests/test_default.py | 3 ++- roles/az_common/tasks/main.yml | 1 + roles/confluence_config/tasks/main.yml | 6 ------ roles/crowd_config/tasks/main.yml | 4 +++- roles/crowd_config/templates/server.xml.j2 | 12 ++++++------ roles/linux_common/tasks/main.yml | 1 - roles/product_common/tasks/amazon.yml | 5 +++++ roles/product_common/tasks/ubuntu.yml | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 roles/az_common/handlers/main.yml diff --git a/group_vars/all.yml b/group_vars/all.yml index 75eb328..0560885 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -14,8 +14,6 @@ postgres_version: "9.6" git_version: "2.14.4" atl_shared_mountpoint: "/media/atl" -java_home: "{{ lookup('env', 'JAVA_HOME') or '/usr/lib/jvm/jre-{{ java_version }}-openjdk'}}" - # Simplify NFS mapping by using a fixed UID atl_product_user_uid: "{{ lookup('env', 'ATL_PRODUCT_USER_UID') or '2001' }}" diff --git a/roles/az_app_insights_install/molecule/default/playbook.yml b/roles/az_app_insights_install/molecule/default/playbook.yml index 2d714e8..d1ba77a 100644 --- a/roles/az_app_insights_install/molecule/default/playbook.yml +++ b/roles/az_app_insights_install/molecule/default/playbook.yml @@ -8,6 +8,7 @@ atl_download_format: "tarball" roles: - role: linux_common + - role: az_common - role: product_common - role: product_install - role: az_app_insights_install diff --git a/roles/az_common/handlers/main.yml b/roles/az_common/handlers/main.yml deleted file mode 100644 index ed97d53..0000000 --- a/roles/az_common/handlers/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/az_common/molecule/default/tests/test_default.py b/roles/az_common/molecule/default/tests/test_default.py index 35f18f9..d6e402c 100644 --- a/roles/az_common/molecule/default/tests/test_default.py +++ b/roles/az_common/molecule/default/tests/test_default.py @@ -9,7 +9,8 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.mark.parametrize('pkg', [ 'netcat', 'rsync', - 'cifs-utils' + 'cifs-utils', + 'python-lxml' ]) def test_pkg(host, pkg): package = host.package(pkg) diff --git a/roles/az_common/tasks/main.yml b/roles/az_common/tasks/main.yml index ddb6b53..6aa7f74 100644 --- a/roles/az_common/tasks/main.yml +++ b/roles/az_common/tasks/main.yml @@ -6,6 +6,7 @@ - netcat - rsync - cifs-utils + - python-lxml - name: Fetch VM ID command: "dmidecode -s system-uuid" diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index 6030c90..887324e 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -1,11 +1,5 @@ --- -- debug: - msg: atl_db_engine {{ atl_db_engine }} - -- debug: - msg: atl_dbms {{ atl_dbms }} - - name: Create application directories file: path: "{{ item }}" diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml index 7da6280..d2d158a 100644 --- a/roles/crowd_config/tasks/main.yml +++ b/roles/crowd_config/tasks/main.yml @@ -47,11 +47,12 @@ insertbefore: "^export CATALINA_OPTS$" marker: "# {mark} ANSIBLE MANAGED CATALINA_OPTS" +# Crowd uses the system jdk installed (atl_use_system_jdk == true) rather than a packaged JDK - name: Set JAVA_HOME lineinfile: path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh" insertafter: "EOF" - line: "export JAVA_HOME={{ java_home | default('/usr/lib/jvm/jre-{{ java_version }}-openjdk') }}" + line: "export JAVA_HOME={{ system_java_home }}" - name: Create application directories file: @@ -114,6 +115,7 @@ positional_args: - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}/crowd" when: + - atl_db_engine == "postgres" - atl_proxy_name is defined - atl_tomcat_scheme is defined - db_created is undefined or not db_created.changed diff --git a/roles/crowd_config/templates/server.xml.j2 b/roles/crowd_config/templates/server.xml.j2 index 3af55c7..84c40d3 100644 --- a/roles/crowd_config/templates/server.xml.j2 +++ b/roles/crowd_config/templates/server.xml.j2 @@ -20,12 +20,12 @@ compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" secure="{{ atl_tomcat_secure }}" scheme="{{ atl_tomcat_scheme }}" - {% if atl_proxy_name is defined and atl_proxy_name != '' %} - proxyName="{{ atl_proxy_name }}" - {% endif %} - {% if atl_proxy_port is defined and atl_proxy_port != '' %} - proxyPort="{{ atl_proxy_port }}" - {% endif %} +{% if atl_proxy_name is defined and atl_proxy_name != '' %} + proxyName="{{ atl_proxy_name }}" +{% endif %} +{% if atl_proxy_port is defined and atl_proxy_port != '' %} + proxyPort="{{ atl_proxy_port }}" +{% endif %} protocol="{{ atl_tomcat_protocol }}"> diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml index d89b870..825fbd7 100644 --- a/roles/linux_common/tasks/main.yml +++ b/roles/linux_common/tasks/main.yml @@ -14,7 +14,6 @@ - unzip - fontconfig - python-psycopg2 - - python-lxml - name: Create product group group: diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml index c02f864..40e0ae4 100644 --- a/roles/product_common/tasks/amazon.yml +++ b/roles/product_common/tasks/amazon.yml @@ -6,6 +6,11 @@ - java-{{ java_version }}-openjdk-devel when: atl_use_system_jdk +- name: Set system_java_home variable + set_fact: + system_java_home: "/usr/lib/jvm/jre-{{ java_version }}-openjdk" + when: atl_use_system_jdk + - name: Install other base packages on Amazon Linux yum: name: diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml index 85d1f9e..5c38ab3 100644 --- a/roles/product_common/tasks/ubuntu.yml +++ b/roles/product_common/tasks/ubuntu.yml @@ -8,9 +8,9 @@ tags: - runtime_pkg -- name: Set java_home variable +- name: Set system_java_home variable set_fact: - java_home: "/usr/lib/jvm/java-{{ java_version }}-openjdk-amd64" + system_java_home: "/usr/lib/jvm/java-{{ java_version }}-openjdk-amd64" when: atl_use_system_jdk - name: Install other base packages on Ubuntu