Merge pull request #350 from lablabs/fix/ansible_19_support

Fixes Ansible 2.19 support

Author: MonolithProjects

README.md

@@ -241,7 +241,7 @@ rke2_etcd_snapshot_source_dir: etcd_snapshots
 # The etcd will be restored only during the initial run, so even if you will leave the the file name specified,
 # the etcd will remain untouched during the next runs.
 # You can either use this or set options in `rke2_etcd_snapshot_s3_options`
-rke2_etcd_snapshot_file:
+rke2_etcd_snapshot_file: ""
 
 # Etcd snapshot location
 rke2_etcd_snapshot_destination_dir: "{{ rke2_data_path }}/server/db/snapshots"
@@ -346,7 +346,6 @@ rke2_wait_for_all_pods_to_be_healthy: false
 # The args passed to the kubectl wait command
 rke2_wait_for_all_pods_to_be_healthy_args: --for=condition=Ready -A --all pod --field-selector=metadata.namespace!=kube-system,status.phase!=Succeeded
 
-
 # Enable debug mode (rke2-service)
 rke2_debug: false
 

defaults/main.yml

@@ -202,7 +202,7 @@ rke2_etcd_snapshot_source_dir: etcd_snapshots
 # The etcd will be restored only during the initial run, so even if you will leave the the file name specified,
 # the etcd will remain untouched during the next runs.
 # You can either use this or set options in `rke2_etcd_snapshot_s3_options`
-rke2_etcd_snapshot_file:
+rke2_etcd_snapshot_file: ""
 
 # Etcd snapshot location
 rke2_etcd_snapshot_destination_dir: "{{ rke2_data_path }}/server/db/snapshots"

meta/argument_specs.yml

@@ -307,7 +307,7 @@ argument_specs:
 
       rke2_etcd_snapshot_file:
         type: str
-        required: false
+        default: ""
         description: "Etcd snapshot file name. When the file name is defined, the etcd will be restored on initial deployment Ansible run."
 
       rke2_etcd_snapshot_destination_dir:

tasks/first_server.yml

@@ -44,13 +44,13 @@
 - name: Register if we need to do a etcd restore from file
   ansible.builtin.set_fact:
     do_etcd_restore: true
-  when: rke2_etcd_snapshot_file and ((ansible_facts.services['rke2-server.service'] is not defined) or (ansible_facts.services['rke2-server.service']['status'] == 'disabled'))
+  when: (rke2_etcd_snapshot_file | length > 0) and ((ansible_facts.services['rke2-server.service'] is not defined) or (ansible_facts.services['rke2-server.service']['status'] == 'disabled'))
 
 - name: Register if we need to do a etcd restore from s3
   ansible.builtin.set_fact:
     do_etcd_restore_from_s3: true
   when:
-    - not rke2_etcd_snapshot_file
+    - rke2_etcd_snapshot_file | length > 0
     - rke2_etcd_snapshot_s3_options is defined
     - rke2_etcd_snapshot_s3_options.access_key
     - rke2_etcd_snapshot_s3_options.secret_key