From aea673bb5fc4f92297ef3798abdd203157359d08 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 6 Sep 2022 12:28:28 -0700
Subject: [PATCH] Update packer for Ubuntu 20.04

Update supporting packages available for Ubuntu 20.04
Isolate the packages needed for Ubuntu 18.04
Remove duplicates

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I15750c2fb5dd5389a3525e2a441d241cce30e331
---
 packer/provision/local-docker.yaml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 0d0d86c1b..c0c0233f2 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -152,7 +152,7 @@
       become: true
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
-    - name: Install supporting packages
+    - name: Install supporting packages (Ubuntu 18.04)
       apt:
         name:
           - unzip
@@ -169,15 +169,31 @@
           - crudini
           - maven
           - python-ncclient
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install supporting packages (Ubuntu 20.04)
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
           - xmlstarlet
           - xvfb
           - crudini
           - maven
-          - python-ncclient
         update_cache: yes
         state: fixed
       become: true
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
     - name: Install npm and addon packages
       apt:
-- 
2.16.6