From 54c270acdc6bfaec1b184b6f17ea247651995f84 Mon Sep 17 00:00:00 2001
From: Jonas <jonas.hagen@qrst.ch>
Date: Tue, 22 Sep 2020 12:32:44 +0200
Subject: [PATCH] Update package list for Fedora 32 (#39)

* Add specific package lists for Fedora.

The python packages have been renamed in Fedora 32 (python3-* -> python-*).
To further support Fedora 31, the RedHat vars have been copied for this case.

* Enable molecule tests for Fedora.
---
 molecule/default/molecule.yml |  6 ++++--
 tasks/main.yml                |  2 ++
 vars/Fedora-31.yml            | 21 +++++++++++++++++++++
 vars/Fedora.yml               | 21 +++++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 vars/Fedora-31.yml
 create mode 100644 vars/Fedora.yml

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 67f5ea1..7b42d48 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,8 +8,10 @@ platforms:
     image: centos:7
   - name: centos-latest
     image: centos:latest
-  # - name: fedora-latest  # epel package not available
-  #   image: fedora:latest
+  - name: fedora-latest
+    image: fedora:latest
+  - name: fedora-31
+    image: fedora:31
   - name: debian-oldstable
     image: debian:oldstable
   - name: debian-stable
diff --git a/tasks/main.yml b/tasks/main.yml
index 94a5df6..bca4212 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,9 @@
 - name: Include OS-specific variables
   include_vars: "{{ item }}"
   with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
 
 - name: Run OS-specific setup
diff --git a/vars/Fedora-31.yml b/vars/Fedora-31.yml
new file mode 100644
index 0000000..90b9760
--- /dev/null
+++ b/vars/Fedora-31.yml
@@ -0,0 +1,21 @@
+---
+borg_packages:
+  - libacl-devel
+  - libacl
+  - gcc
+  - gcc-c++
+  - openssl-devel
+  - python3-pip
+  - python3-wheel
+  - python3-devel
+  - python3-setuptools
+  - openssh-clients
+  - cronie
+
+python_bin: python3
+pip_bin: pip3
+
+borg_python_packages:
+  - cython
+  - borgbackup
+  - borgmatic
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
new file mode 100644
index 0000000..def08f2
--- /dev/null
+++ b/vars/Fedora.yml
@@ -0,0 +1,21 @@
+---
+borg_packages:
+  - libacl-devel
+  - libacl
+  - gcc
+  - gcc-c++
+  - openssl-devel
+  - python-pip
+  - python-wheel
+  - python-devel
+  - python-setuptools
+  - openssh-clients
+  - cronie
+
+python_bin: python
+pip_bin: pip
+
+borg_python_packages:
+  - cython
+  - borgbackup
+  - borgmatic