remove the java installation function from this role (#171)

* remove the java installation from this role

Co-authored-by: nolte <nolte07@googlemail.com>

Author: nolte

CHANGELOG.rst

@@ -1,5 +1,13 @@
 ansible-minecraft changelog
 ===========================
+6.0.0
+----------
+
+Braking Change
+~~~~~
+
+- Remove the Java Installation logic from this role, because Minecraft 1.17 required Java 16, more information at (`#169 <https://github.com/nolte/ansible-minecraft/issues/169>`_). So `minecraft_java_external_managed=true` is the new Normal for this Role, using a extra role  ``nolte/ansible-role-msopenjdk <https://github.com/nolte/ansible-role-msopenjdk>`_ for install java.
+
 
 5.0.0
 ----------

README.md

@@ -23,6 +23,7 @@ This role installs [Minecraft](https://minecraft.net/) or [Spigot](https://www.s
 
 ### Out of Role Scop
 
+- install a *Java Runtime*, this must be done, before you use this Role, you can use [nolte/ansible-role-msopenjdk](https://github.com/nolte/ansible-role-msopenjdk) for example.
 - executing backups and recovery
 - healthy checks like [Minecraft-Region-Fixer](https://github.com/Fenixin/Minecraft-Region-Fixer)
 - handle utility services like [filebeat](https://www.elastic.co/de/products/beats/filebeat) or [prometheus](https://github.com/prometheus/node_exporter)
@@ -60,6 +61,7 @@ and execute ``ansible-galaxy install -r requirements.yml``
 
 -  Python 3.x on the Ansible control machine to generate user ACLs
 -  Ansible 2.7.0+ on the control machine to fetch the Minecraft version
+-  Existing Compatible Java Runtime for start and install Minecraft on target System.
 
 
 ## Contributing

defaults/main.yml

@@ -21,4 +21,4 @@ minecraft_eula_accept: false
 minecraft_spigot_url: https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 minecraft_server_java_ops:
 minecraft_java: /usr/bin/java
-minecraft_java_external_managed: false
+#minecraft_java_external_managed: true

docs/usage/role-variables.rst

@@ -77,9 +77,6 @@ The following variable defaults are defined in ``defaults/main.yml``.
 ``minecraft_server_java_ops``
    additional java ops like remote debug ``-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005`` (default: *none*)
 
-``minecraft_java_external_managed``
-  used for skipping the java installation tasks from this role, for handle Java by external scripts/roles (default: ``false``)
-
 .. _role_config_variabels-minecraft_external_log_conf:
 
 Logging

molecule/ci_single_container/molecule.yml

@@ -1,4 +1,8 @@
 ---
+dependency:
+  name: galaxy
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 platforms:
   - name: instance
     image: ${MOL_IMAGE:-"solita/ubuntu-systemd:18.04"}
@@ -20,6 +24,7 @@ provisioner:
         user_accept_minecraft_eula: ${user_accept_minecraft_eula:-"false"}
         mc_version: ${MC_VERSION:-"latest"}
         minecraft_server: ${MC_SERVER_TYPE:-"minecraft"}
+        jdk_used_version: ${JDK_VERSION:-"11"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

molecule/default/molecule.yml

@@ -1,8 +1,8 @@
 ---
 dependency:
   name: galaxy
-#  options:
-#    role-file: ./molecule/resources/playbooks/requirements.yml
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 driver:
   name: docker
 #lint:
@@ -89,6 +89,7 @@ provisioner:
       minecraftserver:
         user_accept_minecraft_eula: ${mc_accept_eula}
         mc_version: "1.13.1"
+        jdk_used_version: ${JDK_VERSION:-"11"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

molecule/latest/molecule.yml

@@ -1,8 +1,8 @@
 ---
 dependency:
   name: galaxy
-#  options:
-#    role-file: ./molecule/resources/playbooks/requirements.yml
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 driver:
   name: docker
 #lint:
@@ -74,6 +74,7 @@ provisioner:
       minecraftserver:
         user_accept_minecraft_eula: ${mc_accept_eula}
         mc_version: "latest"
+        jdk_used_version: ${JDK_VERSION:-"16"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

molecule/resources/playbooks/playbook.yml

@@ -17,6 +17,9 @@
         - unzip
         - rsync
 
+    - include_role: 
+        name: nolte.msopenjdk
+
   roles:
     - role: "{{ playbook_dir }}/./../../../"
       minecraft_version: "{{ mc_version | default('1.13.1') }}"

molecule/resources/playbooks/requirements.yml

@@ -0,0 +1,2 @@
+roles:
+  - name: nolte.msopenjdk

molecule/resources/tests/test_default.py

@@ -7,17 +7,6 @@
 ).get_hosts("all")
 
 
-def test_java_package_exists(host):
-    if host.system_info.distribution == "centos":
-        java = "java-1.8.0-openjdk"
-    elif host.system_info.distribution == "debian":
-        java = "openjdk-8-jdk"
-    else:
-        java = "default-jdk"
-
-    host.package(java).is_installed
-
-
 def test_gameport_is_open(host):
     host.socket("tcp://0.0.0.0:25565").is_listening