group updates to public branch

lj020326 · Jul 11, 2023 · a53e5f7 · a53e5f7
1 parent 777e5d1
commit a53e5f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/roles/bootstrap-linux-package/tasks/install-packages.yml b/roles/bootstrap-linux-package/tasks/install-packages.yml
@@ -12,7 +12,7 @@
   when:
     - ansible_pkg_mgr == 'yum'
     - bootstrap_linux_package__yum_repo_list|d([])|length>0
-    - ansible_distribution_major_version<8
+    - ansible_distribution_major_version|int is version('8', '<')
   include_tasks: update-repo-yum.yml
 
 #- name: "{{ __log_prefix_packages }} Update yum package repos"
@@ -21,13 +21,6 @@
 #    - bootstrap_linux_package__yum_repo_list|d([])|length>0
 #  include_tasks: update-repo-dnf.yml
 
-- name: "{{ __log_prefix_packages }} Update yum package repos"
-  when:
-    - ansible_pkg_mgr == 'yum'
-    - bootstrap_linux_package__yum_repo_list|d([])|length>0
-    - ansible_distribution_major_version<8
-  include_tasks: update-repo-yum.yml
-
 - name: "{{ __log_prefix_packages }} Set up EPEL from rpm"
   when:
 #    - ansible_pkg_mgr | ['yum','dnf']

diff --git a/roles/bootstrap-webmin/tasks/install-debian.yml b/roles/bootstrap-webmin/tasks/install-debian.yml
@@ -18,8 +18,8 @@
 ## The "signed-by" repo option is available since Debian Stretch
 ## ref: https://github.com/ansible/ansible/issues/78063#issuecomment-1242970339
 - name: webmin | Debian | Set trust key type
-  when: (ansible_distribution=='Ubuntu' and ansible_distribution_major_version|int<=18) or
-    (ansible_distribution=='Debian' and ansible_distribution_major_version|int<=9)
+  when: (ansible_distribution=='Ubuntu' and ansible_distribution_major_version|int is version('18', '<=')) or
+    (ansible_distribution=='Debian' and ansible_distribution_major_version|int is version('9', '<='))
   set_fact:
     __webmin_apt_repo_key_type: apt_key
     __webmin_repo_template: webmin.debian.repo.jessie.j2