Merged in bugfix/ITOPSENG-647-dcdansible---fix-location-o (pull request #104)

Bugfix/ITOPSENG-647 dcdansible   fix location o

Approved-by: Geoff Jacobs
Approved-by: Ben Partridge

DEVELOPMENT.md

@@ -129,7 +129,7 @@ Some notable files and locations:
   /var/log/ansible-bootstrap.log.
 * The Jira installation is under /opt/atlassian/jira/<version>and symlinked to
   /opt/atlassian/jira/current.
-* The systemd service is configured in /etc/systemd/system/jira.service. Its
+* The systemd service is configured in /usr/lib/systemd/system/jira.service. Its
   stdout can be viewed with systemctl status jira.service and journalctl -u
   jira.service.
 * Other Tomcat logs can be located under /opt/atlassian/jira/current/logs/...

roles/product_startup/molecule/bitbucket/playbook.yml

@@ -29,7 +29,7 @@
   pre_tasks:
     - name: Create systemd dir if necessary
       file:
-        path: '/etc/systemd/system/'
+        path: '/usr/lib/systemd/system/'
         state: directory
 
   roles:

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

@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/etc/systemd/system/bitbucket.service')
+    f = host.file('/usr/lib/systemd/system/bitbucket.service')
     assert f.contains("^ExecStart=/opt/atlassian/bitbucket/current/bin/start-bitbucket.sh -fg --no-search$")
     assert f.contains("^UMask=0027$")
     assert f.contains("^LimitNOFILE=4096$")

roles/product_startup/molecule/default/playbook.yml

@@ -12,7 +12,7 @@
   pre_tasks:
     - name: Create systemd dir if necessary
       file:
-        path: '/etc/systemd/system/'
+        path: '/usr/lib/systemd/system/'
         state: directory
 
   roles:

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

@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/etc/systemd/system/jira-software.service')
+    f = host.file('/usr/lib/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'

roles/product_startup/molecule/synchrony/playbook.yml

@@ -20,7 +20,7 @@
   pre_tasks:
     - name: Create systemd dir if necessary
       file:
-        path: '/etc/systemd/system/'
+        path: '/usr/lib/systemd/system/'
         state: directory
 
   roles:

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

@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/etc/systemd/system/synchrony.service')
+    f = host.file('/usr/lib/systemd/system/synchrony.service')
     assert f.contains("^ExecStart=/opt/atlassian/bin/start-synchrony$")
     assert f.contains("^EnvironmentFile=/etc/atl$")
     assert f.contains("^EnvironmentFile=/etc/atl.synchrony$")

roles/product_startup/tasks/main.yml

@@ -3,7 +3,7 @@
 - name: "Install systemd service file"
   template:
     src: "product.service.j2"
-    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
+    dest: "/usr/lib/systemd/system/{{ atl_systemd_service_name }}"
     owner: root
     group: root
     mode: 0640