diff --git a/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java b/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java index a8ba850f..919b14d6 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java @@ -77,6 +77,7 @@ public class AnsiblePrepService { ctx.put("isNode", installType == AnsibleInstallType.node); ctx.put("isSage", installType == AnsibleInstallType.sage); ctx.put("nodeSize", computeDriver.getSize(node.getSizeType())); + ctx.put("jvmMaxRamDivisor", installType == AnsibleInstallType.sage ? "1.7" : "4"); if (restoreKey != null) { ctx.put("restoreKey", restoreKey); ctx.put("restoreTimeoutSeconds", RESTORE_MONITOR_SCRIPT_TIMEOUT_SECONDS); diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties index 29639253..82b7a6aa 100644 --- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties +++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties @@ -1 +1 @@ -bubble.version=Adventure 0.14.2 +bubble.version=Adventure 0.14.3 diff --git a/bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json b/bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json index 9cdbcb67..7aa8dd7b 100644 --- a/bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json +++ b/bubble-server/src/main/resources/ansible/roles/finalizer/files/bubble_role.json @@ -5,7 +5,7 @@ {"name": "server_alias", "value": "[[network.networkDomain]]"}, {"name": "restore_key", "value": "[[restoreKey]]"}, {"name": "install_type", "value": "[[installType]]"}, - {"name": "bubble_java_opts", "value": "-XX:MaxRAM=[[expr nodeSize.memoryMB '//' '2.625']]m"}, + {"name": "bubble_java_opts", "value": "-XX:MaxRAM=[[expr nodeSize.memoryMB '//' jvmMaxRamDivisor]]m"}, {"name": "cert_name", "value": "bubble-[[network.shortId]]"} ], "optionalConfigNames": ["restore_key"] diff --git a/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml index 3e9baab2..00c3b151 100644 --- a/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml +++ b/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml @@ -40,7 +40,7 @@ get_url: url: https://github.com/getbubblenow/bubble-dist/raw/master/mitmproxy/mitmproxy.zip dest: /tmp/mitmproxy.zip - checksum: sha256:1f6fef51e26c6496955979a84d1c0bd797521832fde01a4de79c7cfe25c3da71 + checksum: sha256:b8a59410b3f7651682a2bf657d6d9210e6d4593ad814aa792f35bee1d8fd590f - name: Unzip mitmproxy.zip unarchive: