fix(tumbleweed): ensure openssl package is also installed

myii · myii · commit 69be26fb00c8 · 2021-06-15T18:57:55.000+01:00
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
```
diff --git 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
@@ -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` + `<osarch>.yaml` + `<os_family>.yaml` + `<os>.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
