From 4b2776932fec7adaa971062491365db0e790b681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?=
 <jeremy.gardais@univ-rennes1.fr>
Date: Wed, 23 Sep 2020 17:01:24 +0200
Subject: [PATCH] Move 910 related packages to specific var (Stretch)

---
 CHANGELOG.md      |  5 +++--
 README.md         |  2 +-
 defaults/main.yml | 15 ++++++++-------
 tasks/main.yml    | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 204158d..56c6ace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,10 @@
 ### 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.
-* Add support for Debian Buster and (not tested) Ubuntu Bionic (fix #1).
+* Repositories for Debian Jessie and Ubuntu Trusty won't need modifications anymore with new OS release.
+* Add support for Debian Buster and (not tested) Ubuntu Bionic (fix #1) with version 940.
 * Manage SSL lib until Debian Stretch or Ubuntu Xenial (fix #2).
+* Move packages related to 910 (Debian Stretch|Ubuntu Xenial) to a specific variable.
 
 ## v1.2.0
 
diff --git a/README.md b/README.md
index eb59fdb..a5b7567 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ A role to manage OpenManage (via omreport, omconfig,…), it's web interface OMS
 * **openmanage__install_recommends** : If recommended packages should be install [default : `False`].
 * **openmanage__dep_packages** : List of dependencies packages to be able to run racadm [default : `See default/main.yml`].
 * **openmanage__base_packages** : List of base packages for all racadm base usage [default : `See default/main.yml`].
-* **openmanage__ssl_packages** : List of SSL related packages to fix some dependencies on old versions [default : `See default/main.yml`].
+* **openmanage__stretch_packages** : List of some packages specific to Debian Stretch (or Ubuntu Xenial) and previous versions [default : `See default/main.yml`].
 * **openmanage__webgui_state** : The desired state for web interface of OMSA [default  : `absent`].
 * **openmanage__webgui_packages** : List of packages to provide web interface to OMSA [default : `See default/main.yml`].
 * **openmanage__webgui_service_name** : Name of the systemd unit to manage web interface [default : `dsm_om_connsvc`].
diff --git a/defaults/main.yml b/defaults/main.yml
index a7a2704..1e81eca 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -90,22 +90,23 @@ openmanage__base_packages:
   - 'srvadmin-base'
   - 'srvadmin-idracadm7'
   - 'srvadmin-idracadm8'
-  - 'srvadmin-idrac-ivmcli'
-  - 'srvadmin-idrac-vmcli'
   - 'srvadmin-omcommon'
   - 'srvadmin-server-cli'
   - 'srvadmin-server-snmp'
   - 'srvadmin-storageservices'
                                                                        # ]]]
-# .. envvar:: openmanage__ssl_packages [[[
+# .. envvar:: openmanage__stretch_packages [[[
 #
-# List of SSL related packages to install.
+# List of some packages specific to Debian Stretch (or Ubuntu Xenial)
+# and previous versions.
 #
-# Required until Debian Stretch and Ubuntu Xenial
-# to fix some dependencies
+# Contains required packages (libssl…) and some packages that are no
+# longer presents in more recent versions of OpenManage.
 #
-openmanage__ssl_packages:
+openmanage__stretch_packages:
   - 'libssl1.0.0'
+  - 'srvadmin-idrac-ivmcli'
+  - 'srvadmin-idrac-vmcli'
                                                                        # ]]]
 # .. envvar:: openmanage__webgui_state [[[
 #
diff --git a/tasks/main.yml b/tasks/main.yml
index ca4a401..a23c2b7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,16 +56,16 @@
   until: pkg_dep_result is success
   when: (openmanage__deploy_state == "present")
 
-## Manage SSL packages
-- name: Ensure SSL required packages are present
+## Manage Debian Stretch (or Ubuntu Xenial) specific packages
+- name: "Ensure 910 specific packages (Stretch|Xenial) are in there desired state"
   package:
     name: '{{ item }}'
     state: "present"
     install_recommends: '{{ openmanage__install_recommends | bool }}'
   with_flattened:
-    - '{{ openmanage__ssl_packages | to_nice_json }}'
-  register: pkg_ssl_result
-  until: pkg_ssl_result is success
+    - '{{ openmanage__stretch_packages | to_nice_json }}'
+  register: pkg_stretch_result
+  until: pkg_stretch_result is success
   when: (openmanage__deploy_state == "present" and
         ( (ansible_distribution == "Debian" and ansible_distribution_major_version is version("9", "<=")) or
           (ansible_distribution == "Ubuntu" and ansible_distribution_version is version("16.04", "<="))))