From 2a67095acc230de1d55c9a9329d4c4f079c6246f Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Fri, 22 Jan 2021 12:26:08 +1100
Subject: [PATCH] Move bool coerce up to initialisation.

---
 aws_jira_dc_node.yml                                        | 2 +-
 roles/product_install/defaults/main.yml                     | 1 +
 .../product_install/molecule/default/tests/test_default.py  | 6 +++++-
 roles/product_install/tasks/main.yml                        | 4 +---
 roles/product_startup/defaults/main.yml                     | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index a994279..1a40591 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -7,7 +7,7 @@
     atl_product_family: "jira"
     atl_product_user: "jira"
     atl_product_edition: "jira-{{ lookup('env', 'ATL_PRODUCT_EDITION') | lower }}"
-    atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') }}"
+    atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') | bool }}"
     atl_systemd_service_name: "jira.service"
 
     atl_startup_systemd_params:
diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index 72f5637..c987165 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -36,6 +36,7 @@ atl_servicedesk_url_map:
   default: "{{ atl_servicedesk_versioned_url }}"
 atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | default(atl_servicedesk_url_map['default']) }}"
 
+atl_install_jsd_as_obr: false
 atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr"
 
 force_version_update: false
diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py
index 8e20d76..4a0e068 100644
--- a/roles/product_install/molecule/default/tests/test_default.py
+++ b/roles/product_install/molecule/default/tests/test_default.py
@@ -34,4 +34,8 @@ def test_completed_lockfile(host):
 
     lockfile = host.file('/media/atl/downloads/jira-core.'+upstream+'-x64.bin_completed')
     assert lockfile.exists
-    assert lockfile.user == 'root'
\ No newline at end of file
+    assert lockfile.user == 'root'
+
+def test_servicedesk_not_installed(host):
+    jars = host.file('/media/atl/jira/shared/plugins/installed-plugins')
+    assert len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0
diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index 6d68992..712173c 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -267,6 +267,4 @@
 
 - name: Include if jsd is requested to be installed from OBR
   include_tasks: "jira-servicedesk_as_obr.yml"
-  when:
-    - atl_install_jsd_as_obr is defined
-    - atl_install_jsd_as_obr | bool
+  when: atl_install_jsd_as_obr
diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml
index 70b7708..83e4608 100644
--- a/roles/product_startup/defaults/main.yml
+++ b/roles/product_startup/defaults/main.yml
@@ -2,7 +2,7 @@
 
 # Mostly for molecule testing, as skip-tags doesn't work with handlers.
 atl_startup_enable: true
-atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') or true }}"
+atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') | default(true) | bool }}"
 
 atl_startup_script_map:
   jira: "bin/start-jira.sh"