Proxmox freenas tasks

roles/auth/vars/main.yml

@@ -1,5 +1,5 @@
 ---
-auth__all: "{{ {'host': auth__host, 'group': auth__group, 'default': auth__default} | aybarsm.helper.role_vars(only=auth__use_only) }}"
+auth__all: "{{ {'host': auth__host, 'group': auth__group, 'default': auth__default} | aybarsm.helper.role_items(only=auth__use_only) }}"
 
 auth__users_all: "{{ auth__all | selectattr('entry__type', 'eq', 'user') }}"
 

roles/network/vars/main.yml

@@ -1,4 +1,4 @@
-network__all: "{{ {'host': network__host, 'group': network__group, 'default': network__default} | aybarsm.helper.role_vars(only=network__use_only) }}"
+network__all: "{{ {'host': network__host, 'group': network__group, 'default': network__default} | aybarsm.helper.role_items(only=network__use_only) }}"
 
 ##### BEGIN: network sysctl vars
 network__sysctl_all: "{{ network__all | selectattr('entry__type', 'eq', 'sysctl') |

roles/package_manager/defaults/main.yml → roles/pkg_mgr/defaults/main.yml

@@ -1,39 +1,41 @@
 ---
-package_manager__role_enabled: false
+pkg_mgr__role_enabled: false
 
-package_manager__manage_repo_keys: false
-package_manager__manage_repos: false
-package_manager__manage_packages: false
+pkg_mgr__manage_repo_keys: false
+pkg_mgr__manage_repos: false
+pkg_mgr__manage_packages: false
 
 # Package Manager Strategy:
 # Change the package manager strategy to use for the system i.e. ansible.builtin.apt vs ansible.builtin.package
 # Available options: specific, common
-package_manager__package_strategy: specific
+pkg_mgr__package_module: specific
 
 # Upgrade Strategy:
 # Upgrade the packages on the system either always, never or once
 # Once option stores the state of the upgrade in host with ansible facts
 # Once option requires ansible__role_enabled and ansible__manage_local_facts to be enabled
-# package_manager__upgrade_strategy: once
-package_manager__upgrade_strategy: never
+# pkg_mgr__upgrade_strategy: once
+pkg_mgr__upgrade_strategy: never
 
 # Upgrade Mode:
 # Available options for APT: full, clean_full, safe, clean_safe, yes, clean_yes, dist, clean_dist
 # Available options for DNF: full, clean_full
 # Clean options temproarily removes all repos other than OS default repos before upgrade
-package_manager__upgrade_mode: clean_full
+pkg_mgr__upgrade_mode: clean_full
 # This option removes the backup repo list files in clean upgrade mode after upgrade
-package_manager__clean_upgrade_post_remove_backups: true
+pkg_mgr__clean_upgrade_post_remove_backups: true
 
 # Shared Options:
-package_manager__repo_list_disabled_template: common/repo_list_disabled.j2
-package_manager__repo_list_disabled_comment: "This repository list temporarily disabled by ansible."
-package_manager__upgrade_update_repo_cache: true
-package_manager__repo_list_use_regex: true
+pkg_mgr__repo_list_disabled_template: common/repo_list_disabled.j2
+pkg_mgr__repo_list_disabled_comment: "This repository list temporarily disabled by ansible."
+pkg_mgr__upgrade_update_repo_cache: true
+pkg_mgr__repo_list_use_regex: true
 
 # TODO: Implement this feature
-# package_manager__package_simulation: true
+# pkg_mgr__package_simulation: true
 
-package_manager__default: []
-package_manager__group: []
-package_manager__host: []
+pkg_mgr__use_only: ['host', 'group', 'default']
+
+pkg_mgr__default: []
+pkg_mgr__group: []
+pkg_mgr__host: []

roles/package_manager/handlers/main.yml → roles/pkg_mgr/handlers/main.yml

@@ -7,27 +7,27 @@
 #     ansible__local_fact_updates:
 #       - path: package_manager.upgrade
 #         value: "{{ (__ansible__local_facts.package_manager.upgrade | default([])) + [{'timestamp': now().utcnow().strftime('%Y-%m-%dT%H:%M:%S.%fZ')}] }}"
-#   register: package_manager__upgrade_update_local_facts
-#   listen: "package_manager__upgrade_update_local_facts"
+#   register: pkg_mgr__upgrade_update_local_facts
+#   listen: "pkg_mgr__upgrade_update_local_facts"
 #   when:
-#     - package_manager__upgrade_strategy is defined
-#     - package_manager__upgrade_strategy == 'once'
+#     - pkg_mgr__upgrade_strategy is defined
+#     - pkg_mgr__upgrade_strategy == 'once'
 
 - name: Update DEB repo cache
   become: true
   ansible.builtin.apt:
     update_cache: true
-  register: package_manager__deb_update_repo_cache
-  listen: "package_manager__update_repo_cache"
+  register: pkg_mgr__deb_update_repo_cache
+  listen: "pkg_mgr__update_repo_cache"
   when:
     - ansible_os_family | lower == 'debian'
 
 - name: Clean RPM repo metadata cache
   become: true
   ansible.builtin.command:
     cmd: yum clean metadata
-  register: package_manager__rpm_clean_metadata_cache
-  listen: "package_manager__update_repo_cache"
+  register: pkg_mgr__rpm_clean_metadata_cache
+  listen: "pkg_mgr__update_repo_cache"
   when:
     - ansible_os_family | lower == 'redhat'
 
@@ -38,7 +38,7 @@
     autoclean: true
     autoremove: true
     purge: true
-  register: package_manager__deb_full_clean
-  listen: "package_manager__manager_full_clean"
+  register: pkg_mgr__deb_full_clean
+  listen: "pkg_mgr__manager_full_clean"
   when:
     - ansible_os_family | lower == 'debian'