Merge remote-tracking branch 'origin/master' into ITOPS-1677-add-crowd-support-in-dc-deployment

roles/product_startup/molecule/bitbucket/playbook.yml

@@ -8,11 +8,16 @@
 
     atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
     atl_product_home_shared: "{{ atl_product_home }}/shared"
+    atl_jvm_heap: "dummy_heap"
+    atl_jvm_opts: "dummy_opts"
 
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
       - "Environment=BITBUCKET_HOME={{ atl_product_home }}"
+      - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}"
+      - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
+      - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
 
     atl_startup_exec_options:
       - "-fg"

roles/product_startup/molecule/bitbucket/tests/test_default.py

@@ -12,3 +12,6 @@ def test_service_file(host):
     assert f.contains("^UMask=0027$")
     assert f.contains("^LimitNOFILE=4096$")
     assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$")
+    assert f.contains("^Environment=JVM_MINIMUM_MEMORY=dummy_heap$")
+    assert f.contains("^Environment=JVM_MAXIMUM_MEMORY=dummy_heap$")
+    assert f.contains("^Environment=JVM_SUPPORT_RECOMMENDED_ARGS=dummy_opts$")

roles/product_startup/molecule/default/tests/test_default.py

@@ -9,3 +9,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 def test_service_file(host):
     f = host.file('/etc/systemd/system/jira-software.service')
     assert f.contains("^ExecStart=/opt/atlassian/jira-software/current/bin/start-jira.sh -fg$")
+    assert f.user == 'root'
+    assert f.group == 'root'
+    assert f.mode == 0o0640

roles/product_startup/tasks/main.yml

@@ -4,6 +4,7 @@
   template:
     src: "product.service.j2"
     dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
+<<<<<<< HEAD
   when: atl_product_edition != "crowd"
   notify:
     - Enable Product
@@ -14,6 +15,11 @@
     src: "crowd.service.j2"
     dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
   when: atl_product_edition == "crowd"
+=======
+    owner: root
+    group: root
+    mode: 0640
+>>>>>>> origin/master
   notify:
     - Enable Product
     - Restart Product