From da7eed18d41136b45cf4b25bb4cf8b8b32beab14 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 14 May 2024 10:58:12 -0400 Subject: [PATCH 1/2] Add libssl-dev package as a prerequisite for Debian The Molecule tests pass without this change, but without this change this required package does not get pulled in when building a Kali AMI. Note also that we already pull in the OpenSSL development package for RedHat systems, so adding it for Debian achieves parity. --- molecule/default/tests/test_default.py | 9 ++++++++- vars/Debian.yml | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 758039f..efe5e70 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -22,7 +22,14 @@ def test_packages(host): if codename in ["buster", "bullseye", "bookworm"]: pkgs = ["amazon-efs-utils", "binutils", "make"] else: - pkgs = ["amazon-efs-utils", "binutils", "cargo", "make", "pkgconf"] + pkgs = [ + "amazon-efs-utils", + "binutils", + "cargo", + "libssl-dev", + "make", + "pkgconf", + ] elif distribution in ["amzn"]: pkgs = ["amazon-efs-utils"] else: diff --git a/vars/Debian.yml b/vars/Debian.yml index 24a97a9..1ceceac 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -3,6 +3,7 @@ package_names: - binutils - cargo + - libssl-dev - make - pkgconf From c6bdac2216801a64095b7c6b8eb192009e14c1dd Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 14 May 2024 11:01:22 -0400 Subject: [PATCH 2/2] Use the latest 2.x release for RedHat and newer Debian platforms --- vars/Debian.yml | 2 +- vars/RedHat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/Debian.yml b/vars/Debian.yml index 1ceceac..462a7ed 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -8,4 +8,4 @@ package_names: - pkgconf # The version of amazon-efs-utils to install. -version: 2.0.0 +version: 2.0.1 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 557de95..2f5e8ec 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -7,4 +7,4 @@ package_names: - rpm-build # The version of amazon-efs-utils to install. -version: 2.0.0 +version: 2.0.1