Merged in additional-bool-filter-cleanup (pull request #126)

Additional bool filter cleanup

Approved-by: Geoff Jacobs

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:

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

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'
+    assert lockfile.user == 'root'
+
+def test_servicedesk_not_installed(host):
+    plugins = host.file('/media/atl/jira/shared/plugins/installed-plugins')
+    assert (not plugins.exists) or (len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0)

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

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"

roles/product_startup/handlers/main.yml

@@ -4,7 +4,7 @@
   service:
     name: "{{ atl_systemd_service_name }}"
     state: restarted
-  when: atl_startup_restart | bool
+  when: atl_startup_restart
   no_log: true
 
 - name: Enable Product