From 59a75e98349c6b54393f68fb14ba2cd3dfaad2d1 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Wed, 10 Apr 2019 10:27:23 +1000
Subject: [PATCH] DCD-224: Updates and fixes to jira_config from testing.

---
 roles/jira_config/molecule/default/molecule.yml          | 6 ++++--
 roles/jira_config/molecule/default/playbook.yml          | 2 +-
 roles/jira_config/molecule/default/tests/test_default.py | 1 +
 roles/jira_config/tasks/main.yml                         | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml
index 65faca2..c6a6d26 100644
--- a/roles/jira_config/molecule/default/molecule.yml
+++ b/roles/jira_config/molecule/default/molecule.yml
@@ -6,8 +6,10 @@ driver:
 lint:
   name: yamllint
 platforms:
-  - name: instance
-    image: centos:7
+  - name: amazon_linux2
+    image: amazonlinux:2
+  - name: ubuntu_lts
+    image: ubuntu:bionic
 provisioner:
   name: ansible
   lint:
diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml
index e648f91..ed375e9 100644
--- a/roles/jira_config/molecule/default/playbook.yml
+++ b/roles/jira_config/molecule/default/playbook.yml
@@ -2,7 +2,7 @@
 - name: Converge
   hosts: all
   vars:
-    atl_product_user: "testuser"
+    atl_product_user: "jira"
     atl_product_home: "/var/atlassian/application-data/jira"
     atl_product_installation_dir: "/opt/atlassian/jira"
     atl_installer_temp: "/opt/atlassian/tmp"
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index 81b007e..1e076e7 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -10,6 +10,7 @@ def test_varfile(host):
     f = host.file('/opt/atlassian/tmp/jira.varfile')
     assert f.exists
     assert f.is_file
+    assert f.user == 'jira'
     assert f.contains("app.jiraHome=/var/atlassian/application-data/jira")
     assert f.contains("existingInstallationDir=/opt/atlassian/jira")
     assert f.contains("sys.installationDir=/opt/atlassian/jira")
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 4db77d6..42cb0cc 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -4,3 +4,4 @@
   template:
     src: jira.varfile.j2
     dest: "{{ atl_installer_temp }}/jira.varfile"
+    owner: "{{ atl_product_user }}"