From 7a7d2d225943ada4a031932d7a844b84e84be4f5 Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Thu, 1 Sep 2022 10:24:44 +1000 Subject: [PATCH] adding the jmx file back as mesh is failing to start without it --- aws_bitbucket_mesh_node.yml | 4 +++- roles/bitbucket_mesh/tasks/main.yml | 10 +++++++++- roles/bitbucket_mesh/templates/mesh.properties.j2 | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/aws_bitbucket_mesh_node.yml b/aws_bitbucket_mesh_node.yml index 4192453..80ad066 100644 --- a/aws_bitbucket_mesh_node.yml +++ b/aws_bitbucket_mesh_node.yml @@ -14,9 +14,11 @@ - 'Environment=MESH_HOME={{ atl_home_base }}/{{ atl_product_edition }}' - 'Environment=JAVA_HOME=/usr/lib/jvm/java' - 'Environment=JRE_HOME=/usr/lib/jvm/java' + - 'Environment=JMX_REMOTE_AUTH=password' + - 'Environment=JMX_PASSWORD_FILE={{ atl_home_base }}/{{ atl_product_edition }}/jmx.access' - 'Environment="JVM_SUPPORT_RECOMMENDED_ARGS=-Dmesh.enabled=true -Dplugin.bitbucket-git.mesh.sidecar.child-process=false -Dcom.sun.management.jmxremote.port=4444 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{ atl_home_base }}/{{ atl_product_edition }}/log"' - 'Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}' - - 'PassEnvironment=JAVA_HOME' + - 'PassEnvironment=JMX_REMOTE_AUTH JMX_PASSWORD_FILE JAVA_HOME' atl_startup_exec_path: "{{ mesh_install_dir }}/current/bin/start-mesh.sh" atl_stop_exec_path: "{{ mesh_install_dir }}/current/bin/stop-mesh.sh" diff --git a/roles/bitbucket_mesh/tasks/main.yml b/roles/bitbucket_mesh/tasks/main.yml index c737817..8934f16 100644 --- a/roles/bitbucket_mesh/tasks/main.yml +++ b/roles/bitbucket_mesh/tasks/main.yml @@ -56,10 +56,18 @@ when: - mesh_extract.changed | bool +- name: touch the jmx password file + ansible.builtin.file: + path: "{{ atl_home_base }}/{{ atl_product_edition }}/jmx.access" + state: touch + owner: "{{ atl_product_user_uid }}" + group: "{{ atl_product_user_uid }}" + mode: 0600 + - name: template out mesh.properties ansible.builtin.template: src: mesh.properties.j2 dest: "{{ atl_home_base }}/{{ atl_product_edition }}/mesh.properties" owner: "{{ atl_product_user }}" group: "{{ atl_product_user }}" - mode: 0600 + mode: 0600 \ No newline at end of file diff --git a/roles/bitbucket_mesh/templates/mesh.properties.j2 b/roles/bitbucket_mesh/templates/mesh.properties.j2 index d658684..1143ced 100644 --- a/roles/bitbucket_mesh/templates/mesh.properties.j2 +++ b/roles/bitbucket_mesh/templates/mesh.properties.j2 @@ -2,7 +2,7 @@ grpc.server.address=0.0.0.0 authentication.token={{ ansible_hostname | hash('md5') }} -node.name= {{ ansible_hostname }} +node.name={{ ansible_hostname }} node.id={{ ansible_hostname }} jmx.enabled={{ mesh_jmx_enabled | default(false) }}