From 200f265c6c15438ba525fc87629cd42fa2d80a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Wed, 23 Sep 2020 14:59:53 +0200 Subject: [PATCH] Fix in time repositories for Jessie and Trusty --- CHANGELOG.md | 7 +++++++ defaults/main.yml | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3320375..4a97a51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v1.x.y + +### Enhancements + +* Skip "Ensure to remove OpenManage related packages if requested" when it's not install (with package facts). +* Repositories for Debian Jessie and Ubuntu Trusty won't need modifications with new OS versions. + ## v1.2.0 ### Enhancements diff --git a/defaults/main.yml b/defaults/main.yml index 7c7cf4c..7abc3a0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,14 +23,15 @@ openmanage__repositories: state: '{{ openmanage__deploy_state if (ansible_distribution_release in ["stretch", "xenial"]) else "absent" }}' - # Previous version for Debian until Jessie and Ubuntu until Trusty + # Previous OpenManage version for Debian until Jessie and Ubuntu until Trusty - repo: 'deb http://linux.dell.com/repo/community/debian/dists/{{ ansible_distribution_release }} {{ ansible_distribution_release }} openmanage' mode: '0644' filename: 'dell.openmanage' key_id: '1285491434D8786F' key_keyserver: 'pool.sks-keyservers.net' state: '{{ openmanage__deploy_state - if (ansible_distribution_release not in ["stretch", "xenial"]) + if ((ansible_distribution == "Debian" and ansible_distribution_major_version is version("8", "<=")) or + (ansible_distribution == "Ubuntu" and ansible_distribution_version is version("14.04", "<="))) else "absent" }}' # ]]] # ]]]