diff --git a/aws_bitbucket_mesh_node.yml b/aws_bitbucket_mesh_node.yml index 86a466f..beb47ce 100644 --- a/aws_bitbucket_mesh_node.yml +++ b/aws_bitbucket_mesh_node.yml @@ -14,11 +14,9 @@ - '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_SUPPORT_RECOMMENDED_ARGS=-Dmesh.enabled=true -Dplugin.bitbucket-git.mesh.sidecar.child-process=false -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{ atl_home_base }}/{{ atl_product_edition }}/log"' - 'Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}' - - 'PassEnvironment=JMX_REMOTE_AUTH JMX_PASSWORD_FILE JAVA_HOME' + - 'PassEnvironment=JAVA_HOME' atl_startup_exec_path: "{{ atl_product_installation_base }}/current/bin/start-mesh.sh" atl_stop_exec_path: "{{ atl_product_installation_base }}/current/bin/stop-mesh.sh" diff --git a/roles/bitbucket_mesh_config/tasks/main.yml b/roles/bitbucket_mesh_config/tasks/main.yml index 0e1601e..7a4e787 100644 --- a/roles/bitbucket_mesh_config/tasks/main.yml +++ b/roles/bitbucket_mesh_config/tasks/main.yml @@ -1,13 +1,5 @@ --- -- name: Touch the JMX password file - ansible.builtin.file: - path: "{{ atl_product_home }}/jmx.access" - state: touch - owner: "{{ atl_product_user }}" - group: "{{ atl_product_user }}" - mode: 0600 - # assume bbdc secret exists (else fail) - setup stuff for calling bitbucket rest api and get mesh node report # get the registered mesh node info as we need it for determining nodenames - name: Import Bitbucket API setup pieces