From 7b9e9e23289271ac507c70148ad46ed21fc3ad2d Mon Sep 17 00:00:00 2001 From: Brett Meehan Date: Thu, 21 May 2020 10:17:22 +1000 Subject: [PATCH] ITOPSENG-647 put product service file in the default path to allow systemctl mask and other linking operations to work properly --- DEVELOPMENT.md | 10 +++++----- .../molecule/bitbucket/tests/test_default.py | 2 +- .../molecule/default/tests/test_default.py | 2 +- .../molecule/synchrony/tests/test_default.py | 2 +- roles/product_startup/tasks/main.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index c113f55..2f75c73 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -24,7 +24,7 @@ ways to do this; either directly if packaged, or via pip... # Ubuntu 19.04+, Debian 10+ sudo apt-get install pipenv python-dev - + # Older versions & RHEL/Amazon Linux, etc. sudo apt-get install -y python-pip python-dev # Or... @@ -129,7 +129,7 @@ Some notable files and locations: /var/log/ansible-bootstrap.log. * The Jira installation is under /opt/atlassian/jira/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/... @@ -138,11 +138,11 @@ Some notable files and locations: * This repository is configured to run tests on [bitbucket pipelines](https://bitbucket.org/atlassian/dc-deployments-automation/addon/pipelines/home). * Pipeline definition is located in the [root of the repository](https://bitbucket.org/atlassian/dc-deployments-automation/src/master/bitbucket-pipelines.yml) * Pipeline configuration is generated using Jinja2 and a simple python script. Pipeline generator is located [here](https://bitbucket.org/atlassian/dc-deployments-automation/src/master/pipeline_generator/) - * A pipeline configuration is generated by running the following make command + * A pipeline configuration is generated by running the following make command ``` make generate-pipeline > ../bitbucket-pipelines.yml - ``` - + ``` + * [Molecule](https://molecule.readthedocs.io/en/stable/) tests are run in batches. A single test is run per batch to optimize for a faster dev feedback loop * If you create a new role or add a new molecule scenario, then please ensure that you generate a new pipeline configuration by running the make command described above. If a new pipeline configuration is not generated, then the CI may not run any tests as it would fail at a pre-test validate stage. \ No newline at end of file diff --git a/roles/product_startup/molecule/bitbucket/tests/test_default.py b/roles/product_startup/molecule/bitbucket/tests/test_default.py index 14feb7c..8bec4b7 100644 --- a/roles/product_startup/molecule/bitbucket/tests/test_default.py +++ b/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$") diff --git a/roles/product_startup/molecule/default/tests/test_default.py b/roles/product_startup/molecule/default/tests/test_default.py index 8210664..3ef51d9 100644 --- a/roles/product_startup/molecule/default/tests/test_default.py +++ b/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' diff --git a/roles/product_startup/molecule/synchrony/tests/test_default.py b/roles/product_startup/molecule/synchrony/tests/test_default.py index 447af2e..5451915 100644 --- a/roles/product_startup/molecule/synchrony/tests/test_default.py +++ b/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$") diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml index 706bee3..c604379 100644 --- a/roles/product_startup/tasks/main.yml +++ b/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