From 69be26fb00c83a0665ff830808ac3a7b22b84f02 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 15 Jun 2021 18:57:55 +0100 Subject: [PATCH] fix(tumbleweed): ensure `openssl` package is also installed Avoid this failure: ``` ID: openvpn_create_dh_512 Function: cmd.run Name: "openssl" dhparam -out "/etc/openvpn/dh512.pem" 512 Result: False Comment: Command ""openssl" dhparam -out "/etc/openvpn/dh512.pem" 512" run ``` --- openvpn/parameters/map_jinja.yaml | 1 + .../oscodename/openSUSE Tumbleweed.yaml | 17 +++++++++++++++++ .../default/files/_mapdata/amazonlinux-1.yaml | 1 + .../default/files/_mapdata/amazonlinux-2.yaml | 1 + .../files/_mapdata/arch-base-latest.yaml | 1 + .../default/files/_mapdata/centos-6.yaml | 1 + .../default/files/_mapdata/centos-7.yaml | 1 + .../default/files/_mapdata/centos-8.yaml | 1 + .../default/files/_mapdata/debian-10.yaml | 1 + .../default/files/_mapdata/debian-9.yaml | 1 + .../default/files/_mapdata/fedora-31.yaml | 1 + .../default/files/_mapdata/fedora-32.yaml | 1 + .../default/files/_mapdata/fedora-33.yaml | 1 + .../default/files/_mapdata/gentoo-2-sysd.yaml | 1 + .../default/files/_mapdata/gentoo-2-sysv.yaml | 1 + .../default/files/_mapdata/opensuse-15.yaml | 1 + .../files/_mapdata/opensuse-tumbleweed.yaml | 2 ++ .../default/files/_mapdata/oraclelinux-7.yaml | 1 + .../default/files/_mapdata/oraclelinux-8.yaml | 1 + .../default/files/_mapdata/ubuntu-16.yaml | 1 + .../default/files/_mapdata/ubuntu-18.yaml | 1 + .../default/files/_mapdata/ubuntu-20.yaml | 1 + .../default/files/_mapdata/windows-10.yaml | 1 + .../files/_mapdata/windows-2016-server.yaml | 1 + .../files/_mapdata/windows-2019-server.yaml | 1 + .../default/files/_mapdata/windows-8.yaml | 1 + 26 files changed, 43 insertions(+) create mode 100644 openvpn/parameters/oscodename/openSUSE Tumbleweed.yaml diff --git a/openvpn/parameters/map_jinja.yaml b/openvpn/parameters/map_jinja.yaml index 389892e..3ed9ca4 100644 --- a/openvpn/parameters/map_jinja.yaml +++ b/openvpn/parameters/map_jinja.yaml @@ -8,6 +8,7 @@ values: - "Y:G@osarch" - "Y:G@os_family" - "Y:G@os" + - "Y:G@oscodename" - "Y:G@osfinger" # For compatibility, don't merge `salt["config.get"]("openvpn")` diff --git a/openvpn/parameters/oscodename/openSUSE Tumbleweed.yaml b/openvpn/parameters/oscodename/openSUSE Tumbleweed.yaml new file mode 100644 index 0000000..ff32020 --- /dev/null +++ b/openvpn/parameters/oscodename/openSUSE Tumbleweed.yaml @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +# +# Setup variables specific to +# salt['config.get']('oscodename') == openSUSE Tumbleweed. +# You just need to add the key:values for this `oscodename` that differ +# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# +# If you do not need to provide defaults via the `oscodename` config, +# you can remove this file or provide at least an empty dict, e.g. +# values: {} +--- +values: + pkgs: + - openvpn + - openssl +... diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 1b0d8a6..1c132a4 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 194ac96..5cb1068 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index c254793..0be48f8 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index 35b701f..46bbb39 100644 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ b/test/integration/default/files/_mapdata/centos-6.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index f579fc7..1801333 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 4fd3412..47e6453 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 8d63774..9c994c9 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -26,6 +26,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 8254c37..2579745 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -26,6 +26,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 0b21029..11f2a8f 100644 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ b/test/integration/default/files/_mapdata/fedora-31.yaml @@ -23,6 +23,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 3c1e66f..932ae43 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -23,6 +23,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index f342322..e48bd0e 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -23,6 +23,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 557a3fe..810783b 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index cd6d0af..8827bca 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 88864b5..424591d 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 9630710..a5451b3 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id @@ -29,6 +30,7 @@ values: - network-manager-openvpn-gnome pkgs: - openvpn + - openssl service: openvpn service_function: running user: openvpn diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 222406d..acbef5c 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index d27fb8c..dc85e1e 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -20,6 +20,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index eb5e607..60b9c13 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -26,6 +26,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 855350e..b256e89 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -26,6 +26,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 7f8f42a..c7cbff5 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -26,6 +26,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/windows-10.yaml b/test/integration/default/files/_mapdata/windows-10.yaml index a13c67f..3b8d345 100644 --- a/test/integration/default/files/_mapdata/windows-10.yaml +++ b/test/integration/default/files/_mapdata/windows-10.yaml @@ -18,6 +18,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml index 3a77df6..5e2bc5c 100644 --- a/test/integration/default/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2016-server.yaml @@ -18,6 +18,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml index 3261205..c42be4c 100644 --- a/test/integration/default/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2019-server.yaml @@ -18,6 +18,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id diff --git a/test/integration/default/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml index 634edfe..658de82 100644 --- a/test/integration/default/files/_mapdata/windows-8.yaml +++ b/test/integration/default/files/_mapdata/windows-8.yaml @@ -18,6 +18,7 @@ values: - Y:G@osarch - Y:G@os_family - Y:G@os + - Y:G@oscodename - Y:G@osfinger - C@openvpn:lookup - Y:G@id