From ef5c8ce1f3e3a43e96302e0ab7e86aafd4515cf4 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 22 Mar 2022 19:48:35 +0100
Subject: [PATCH] Fixes for ubuntu focal

---
 .../dell-server-utilities/defaults/main.yml   |  2 +-
 .../dell-server-utilities/tasks/main.yml      | 11 +++++++++-
 .../ubuntu-deb-general/defaults/main.yml      | 10 ++++++++-
 .../ubuntu-deb-general/tasks/packages.yml     | 21 ++++++++++++-------
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/library/roles/dell-server-utilities/defaults/main.yml b/library/roles/dell-server-utilities/defaults/main.yml
index eb8b1364..f404309e 100644
--- a/library/roles/dell-server-utilities/defaults/main.yml
+++ b/library/roles/dell-server-utilities/defaults/main.yml
@@ -4,7 +4,7 @@ dell_utilities_base_dir: /opt/dell_dsu
 dell_utilities_packages:
   - dell-system-update
   - srvadmin-all
-  - syscfg
+  #- syscfg
 
 dell_utilities_raid_packages:
   - raidcfg
diff --git a/library/roles/dell-server-utilities/tasks/main.yml b/library/roles/dell-server-utilities/tasks/main.yml
index 1981432f..a3a8de57 100644
--- a/library/roles/dell-server-utilities/tasks/main.yml
+++ b/library/roles/dell-server-utilities/tasks/main.yml
@@ -3,11 +3,20 @@
   - name: Create the Dell utilities directory
     file: dest={{ dell_utilities_base_dir }} state=directory
 
+  - name: Check if the Dell utility installer is already present
+    stat:
+      path: /opt/dell_dsu/dsu_installer
+    register: dell_dsu_installer_bin
+
   - name: Download the Dell utility installer
     get_url: url={{ dell_utilities_installer_url }} dest={{ dell_utilities_base_dir }}/dsu_installer mode=0700
+    when: not dell_dsu_installer_bin.stat.exists
 
   - name: Run the installer
-    command: '{{ dell_utilities_base_dir }}/dsu_installer'
+    shell: >
+      {{ dell_utilities_base_dir }}/dsu_installer && touch {{ dell_utilities_base_dir }}/.dsu_installer_run
+    args:
+      creates: '{{ dell_utilities_base_dir }}/.dsu_installer_run'
 
   when:
     -  "'Dell' in ansible_system_vendor"
diff --git a/library/roles/ubuntu-deb-general/defaults/main.yml b/library/roles/ubuntu-deb-general/defaults/main.yml
index 4da44e88..9880cccd 100644
--- a/library/roles/ubuntu-deb-general/defaults/main.yml
+++ b/library/roles/ubuntu-deb-general/defaults/main.yml
@@ -37,7 +37,7 @@ default_python_packages_trusty:
   - python-lxml
   - python-boto
 
-default_python_packages:
+default_python_packages_bionic:
   - python-lxml
   - python3-lxml
   - python-boto
@@ -45,6 +45,14 @@ default_python_packages:
   - python-setuptools
   - python3-setuptools
 
+default_python_packages_focal:
+    - python-lxml
+    - python3-lxml
+    - python-ipaddress
+    - python3-ipaddr
+    - python-setuptools
+    - python3-setuptools
+  
 # Set this variable in your playbook
 # additional_packages:
 #   - pkg1
diff --git a/library/roles/ubuntu-deb-general/tasks/packages.yml b/library/roles/ubuntu-deb-general/tasks/packages.yml
index 5f56fef1..b43a705b 100644
--- a/library/roles/ubuntu-deb-general/tasks/packages.yml
+++ b/library/roles/ubuntu-deb-general/tasks/packages.yml
@@ -3,13 +3,6 @@
   apt: pkg=aptitude state=present cache_valid_time=1800
   tags: packages
 
-- name: Install the basic python packages. Not Trusty
-  apt: pkg={{ default_python_packages }} state=present cache_valid_time=1800
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_release != "trusty"
-  tags: packages
-
 - name: Install the basic python packages on trusty
   apt: pkg={{ default_python_packages_trusty }} state=present update_cache=yes cache_valid_time=1800
   when:
@@ -17,6 +10,20 @@
     - ansible_distribution_release == "trusty"
   tags: packages
 
+- name: Install the basic python packages on Ubuntu Bionic
+  apt: pkg={{ default_python_packages_bionic }} state=present cache_valid_time=1800
+  when:
+    - ansible_distribution == "Ubuntu"
+    - ansible_distribution_release == "bionic"
+  tags: packages
+
+- name: Install the basic python packages on Ubuntu Focal
+  apt: pkg={{ default_python_packages_focal }} state=present cache_valid_time=1800
+  when:
+    - ansible_distribution == "Ubuntu"
+    - ansible_distribution_release == "focal"
+  tags: packages
+
 - name: Install software-properties-common if needed
   apt: pkg=software-properties-common state=present update_cache=yes cache_valid_time=1800
   when: