Fix the version handling.

templates/elasticsearch.yml.j2

@@ -21,6 +21,9 @@ cluster.name: {{ elasticsearch_cluster_name }}
 # Use a descriptive name for the node:
 #
 node.name: {{ ansible_fqdn }}
+{% if elasticsearch_major_version >= 7 and elasticsearch_minor_version >= 9 %}
+xpack.ml.enabled: false
+{% endif %}
 
 {% if elasticsearch_kibana_proxy %}
 # This node is bein used by kibana as proxy to a cluster

templates/jvm.options.j2

@@ -33,9 +33,11 @@
 ################################################################
 
 ## GC configuration
+{% if openjdk_default < 8 %}
 -XX:+UseConcMarkSweepGC
 -XX:CMSInitiatingOccupancyFraction=75
 -XX:+UseCMSInitiatingOccupancyOnly
+{% endif %}
 
 ## optimizations
 

vars/main.yml

@@ -4,10 +4,9 @@ elasticsearch_repo_version: '{{ elasticsearch_major_version }}.x'
 elasticsearch_version: '{{ elasticsearch_major_version }}.{{ elasticsearch_minor_version }}.{{ elasticsearch_patch_version }}'
 elasticsearch_repo: 'deb https://artifacts.elastic.co/packages/{{ elasticsearch_repo_version }}/apt stable main'
 elasticsearch_packages:
-  - elasticsearch
+  - 'elasticsearch={{ elasticsearch_version }}'
 
 elasticsearch_plugin_bin: /usr/share/elasticsearch/bin/elasticsearch-plugin
 
 elasticsearch_kibana_packages:
-  - kibana
-
+  - 'kibana={{ elasticsearch_version }}'