blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in DCD-418-move-db-params-to-env (pull request #9)

Browse Source 
DCD-418: Move Synchrony JWT and DB parameters to environment vars

Approved-by: Ben Partridge <bpartridge@atlassian.com>
This commit is contained in:
Steve Smith
2019-07-10 06:53:00 +00:00
parent 57e3ae9856 5dc978afb0
commit c3a25ebb14
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/product_startup/molecule/default/tests/test_default.py
View File

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

3
roles/product_startup/tasks/main.yml
View File

@@ -4,6 +4,9 @@
template: template:
src: "product.service.j2" src: "product.service.j2"
dest: "/etc/systemd/system/{{ atl_systemd_service_name }}" dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
owner: root
group: root
mode: 0640
notify: notify:
- Enable Product - Enable Product
- Restart Product - Restart Product

6
roles/synchrony_config/files/start-synchrony
View File

@@ -55,9 +55,11 @@ function waitForConfluenceConfigInSharedHome() {
waitForConfluenceConfigInSharedHome waitForConfluenceConfigInSharedHome
# Additional settings are in /etc/atl.synchrony
export SYNCHRONY_JWT_PRIVATE_KEY
export SYNCHRONY_JWT_PUBLIC_KEY
exec ${_RUNJAVA} \ exec ${_RUNJAVA} \
-classpath ${SYNCHRONY_CLASSPATH} \ -classpath ${SYNCHRONY_CLASSPATH} \
${ATL_SYNCHRONY_JVM_PROPERTIES} \ ${ATL_SYNCHRONY_JVM_PROPERTIES} \
-Djwt.private.key=${SYNCHRONY_JWT_PRIVATE_KEY} \
-Djwt.public.key=${SYNCHRONY_JWT_PUBLIC_KEY} \
synchrony.core sql synchrony.core sql

5
roles/synchrony_config/templates/atl.synchrony.j2
View File

@@ -9,11 +9,12 @@ ATL_SYNCHRONY_JAR_PATH="{{ atl_product_installation_current }}/confluence/WEB-IN
AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}" AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}"
_RUNJAVA="{{ atl_product_installation_current }}/jre/bin/java" _RUNJAVA="{{ atl_product_installation_current }}/jre/bin/java"
SYNCHRONY_DATABASE_USERNAME="{{ atl_jdbc_user }}"
SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}"
ATL_SYNCHRONY_JVM_PROPERTIES="{{ atl_synchrony_stack_space }} {{ atl_synchrony_memory }} \ ATL_SYNCHRONY_JVM_PROPERTIES="{{ atl_synchrony_stack_space }} {{ atl_synchrony_memory }} \
-Dsynchrony.cluster.impl=hazelcast-btf \ -Dsynchrony.cluster.impl=hazelcast-btf \
-Dsynchrony.database.url={{ atl_jdbc_url }} \ -Dsynchrony.database.url={{ atl_jdbc_url }} \
-Dsynchrony.database.username={{ atl_jdbc_user }} \
-Dsynchrony.database.password={{ atl_jdbc_password }} \
-Dsynchrony.bind={{ atl_local_ipv4 }} \ -Dsynchrony.bind={{ atl_local_ipv4 }} \
-Dsynchrony.cluster.bind={{ atl_local_ipv4 }} \ -Dsynchrony.cluster.bind={{ atl_local_ipv4 }} \
-Dcluster.interfaces={{ atl_local_ipv4 }} \ -Dcluster.interfaces={{ atl_local_ipv4 }} \