roles/lego/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 lego_user: "lego"
-lego_version: "4.19.2"
+lego_version: "4.18.0"
 lego_instance: default
 lego_base_path: "/opt/lego"
 lego_cert_user: "acme-{{ lego_instance }}"

roles/mariadb/defaults/main.yml

@@ -1,9 +1,8 @@
 ---
+
 mariadb_version: "10.11.9"
 mariadb_base_path: /var/lib/mariadb
-mariadb_data_path: >-2
+mariadb_data_path: "{{ mariadb_base_path }}/{{ mariadb_version }}"
-  {{ mariadb_base_path }}/{{ mariadb_version | split('.') | first }}
-mariadb_state: present
 
 mariadb_root_password: ~
 mariadb_database: ~
@@ -14,24 +13,10 @@ mariadb_container_base_environment:
   MARIADB_ROOT_PASSWORD: "{{ mariadb_root_password }}"
 mariadb_container_extra_environment: {}
 
-mariadb_container_image_registry: docker.io
-mariadb_container_image_namespace: ~
-mariadb_container_image_name: mariadb
-mariadb_container_image_tag: ~
-mariadb_container_image: >-2
-  {{
-    ([
-      mariadb_container_image_registry | default([], true),
-      mariadb_container_image_namespace | default([], true),
-      mariadb_container_image_name,
-    ] | flatten | join('/'))
-    + ':' + mariadb_container_image_tag | default(mariadb_version, true)
-  }}
-mariadb_container_image_source: pull
-mariadb_container_image_force_source: >-2
-  {{ mariadb_container_image_tag | default(false, true) | bool }}
-
 mariadb_container_name: mariadb
+mariadb_container_image_name: docker.io/mariadb
+mariadb_container_image_tag: ~
+mariadb_container_image: "{{ mariadb_container_image_name }}:{{ mariadb_container_image_tag | default(mariadb_version, true) }}"
 mariadb_container_base_volumes:
   - "{{ mariadb_data_path }}:{{ mariadb_container_data_path }}:z"
 mariadb_container_extra_volumes: []
@@ -45,5 +30,3 @@ mariadb_container_environment: >-2
       if (mariadb_database and mariadb_username and mariadb_password)
       else {}, recursive=True)
   | combine(mariadb_container_extra_environment) }}
-mariadb_container_state: >-2
-  {{ (mariadb_state == 'present') | ternary('started', 'absent') }}

roles/mariadb/tasks/main.yml

@@ -1,21 +1,20 @@
 ---
-- name: Ensure mariadb container image '{{ mariadb_container_image }}' is {{ mariadb_state }}
+- name: Ensure mariaDB container image is present on host
   community.docker.docker_image:
     name: "{{ mariadb_container_image }}"
-    state: "{{ mariadb_state }}"
+    state: present
-    source: "{{ mariadb_container_image_source }}"
+    source: pull
-    force_source: "{{ mariadb_container_image_force_source }}"
 
-- name: Ensure mariadb container '{{ mariadb_container_name }}' is {{ mariadb_container_state }}
+- name: Ensure mariaDB {{ mariadb_version }} is running as '{{ mariadb_container_name }}'
   community.docker.docker_container:
     name: "{{ mariadb_container_name }}"
     image: "{{ mariadb_container_image }}"
     env: "{{ mariadb_container_environment }}"
-    ports: "{{ mariadb_container_ports | default(omit, true) }}"
+    ports: "{{ mariadb_container_ports }}"
-    labels: "{{ mariadb_container_labels | default(omit, true) }}"
+    labels: "{{ mariadb_container_labels }}"
     volumes: "{{ mariadb_container_volumes }}"
     networks: "{{ mariadb_container_networks | default(omit, true) }}"
     etc_hosts: "{{ mariadb_container_etc_hosts | default(omit, true) }}"
     purge_networks: "{{ mariadb_container_purge_networks | default(omit, true) }}"
     restart_policy: "{{ mariadb_container_restart_policy }}"
-    state: "{{ mariadb_container_state }}"
+    state: started