Merge pull request #6 from hellofresh/patch/CRS-1539/ansible-syntax

CRS-1539 Fix ansible 2.10 compatibility issues

Author: Anton Ustyuzhanin

library/load_user_files.py

@@ -142,7 +142,7 @@ def main():
             name=dict(default=None, aliases=["path"], required=True, type='list'),
             fact=dict(default="var_dir", required=False),
             databag=dict(default=False, type='bool'),
-            extract_extra_keys=dict(default=True, required=False)
+            extract_extra_keys=dict(default=True, required=False, type='bool')
         ),
         supports_check_mode=False
     )

library/usersdb.py

@@ -282,7 +282,7 @@ def main():
             source_userdb=dict(default=None, required=False, type="dict"),
             teamsdb=dict(default=None, required=False, type="dict"),
             serversdb=dict(default=None, required=False, type="list"),
-            extract_extra_keys=dict(default=True, required=False),
+            extract_extra_keys=dict(default=True, required=False, type='bool'),
             usermanage_selected_users=dict(default=None, required=False),
         ),
         supports_check_mode=False

tasks/include-vars.yml

@@ -1,12 +1,10 @@
 ---
-
 - name: include-vars | Include flatfiles as variables
   include_vars: "{{ item }}"
   with_items: "{{ usermanage_include_vars }}"
-  when: "{{ usermanage_include_vars_type == 'file' }}"
+  when: usermanage_include_vars_type == 'file'
 
 - name: include-vars | Include flatfiles in a directory as variables
   include_vars: dir="{{ item }}"
   with_items: "{{ usermanage_include_vars }}"
-  when: "{{ usermanage_include_vars_type == 'dir' and ansible_version.full >= '2.2.0.0' }}"
-
+  when: usermanage_include_vars_type == 'dir'

tasks/sources.yml

@@ -23,4 +23,4 @@
   delegate_to: localhost
   connection: local
   become: no
-  when: usermanage_usersdb is defined or loaded_users_db[usermanage_source_facts] is defined
+  when: usermanage_usersdb is defined or loaded_users_db[usermanage_source_facts] is defined