summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2022-08-30 16:52:38 +0000
committerGerrit Code Review <gerrit@onap.org>2022-08-30 16:52:38 +0000
commitf64548d8d75024665f897ed13edb91271d5e620f (patch)
treebbe3e36e2af9db87338148133e54849ebb1820aa
parent2515184e6db4600eb77c0a5594a5ee9aef4fa208 (diff)
parent4844bb9b152df7f0f0e8d72aa8b1258fa369dfaf (diff)
Merge "Fix: Replace nodejs-dev with libnode-dev on 20.04 Ubuntu Should fix IT-24453"
-rw-r--r--packer/provision/local-builder.yaml10
-rw-r--r--packer/provision/local-docker.yaml10
2 files changed, 18 insertions, 2 deletions
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 18017b888..fa1038d17 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -85,7 +85,15 @@
update_cache: yes
state: fixed
become: true
- when: ansible_distribution == 'Ubuntu'
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+ - name: Install libnode-dev dep for npm
+ apt:
+ name: libnode-dev
+ update_cache: yes
+ state: fixed
+ become: true
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- name: Install base packages
apt:
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 869202d75..0d0d86c1b 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -142,7 +142,15 @@
update_cache: yes
state: fixed
become: true
- when: ansible_distribution == 'Ubuntu'
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+ - name: Install libnode-dev dep for npm
+ apt:
+ name: libnode-dev
+ update_cache: yes
+ state: fixed
+ become: true
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
- name: Install supporting packages
apt: