Update roles and netbox inventory

roles/geerlingguy.java/.travis.yml

@@ -10,6 +10,7 @@ env:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: fedora31
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
@@ -17,7 +18,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.

roles/geerlingguy.java/meta/.galaxy_install_info

@@ -1,2 +1,2 @@
-install_date: Fri Apr  3 19:21:40 2020
-version: 1.9.7
+install_date: Wed Jun 24 18:44:31 2020
+version: 1.10.0

roles/geerlingguy.java/meta/main.yml

@@ -29,6 +29,7 @@ galaxy_info:
         - trusty
         - xenial
         - bionic
+        - focal
     - name: FreeBSD
       versions:
         - 10.2

roles/geerlingguy.java/molecule/default/molecule.yml

@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}

roles/geerlingguy.java/molecule/default/playbook.yml

@@ -1,13 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-  roles:
-    - role: geerlingguy.java

roles/geerlingguy.java/molecule/default/yaml-lint.yml

@@ -1,6 +0,0 @@
----
-extends: default
-rules:
-  line-length:
-    max: 120
-    level: warning

roles/geerlingguy.java/tasks/setup-Debian.yml

@@ -8,7 +8,7 @@
     recurse: true
   when:
     - ansible_distribution == 'Ubuntu'
-    - ansible_distribution_version == '18.04'
+    - ansible_distribution_major_version | int >= 18
 
 - name: Ensure Java is installed.
   apt: