From 768cf6bf1d2797ebcf56283d939d34a4fd3dc9d2 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 6 Dec 2020 20:31:24 -0600
Subject: [PATCH] Ensure generic OS are actually generic, and add Fedora 32, 33

---
 tasks/main.yml                                |  1 +
 ...CentOS-6-i386.yml => CentOS-6-default.yml} |  0
 vars/CentOS-6-x86_64.yml                      | 19 -------------------
 ...ntOS-7-x86_64.yml => CentOS-7-default.yml} |  0
 ...ntOS-8-x86_64.yml => CentOS-8-default.yml} |  0
 ...ra-29-x86_64.yml => Fedora-29-default.yml} |  0
 ...ra-30-x86_64.yml => Fedora-30-default.yml} |  0
 ...ra-31-x86_64.yml => Fedora-31-default.yml} |  0
 vars/Fedora-32-default.yml                    | 10 ++++++++++
 vars/Fedora-33-default.yml                    | 10 ++++++++++
 10 files changed, 21 insertions(+), 19 deletions(-)
 rename vars/{CentOS-6-i386.yml => CentOS-6-default.yml} (100%)
 delete mode 100644 vars/CentOS-6-x86_64.yml
 rename vars/{CentOS-7-x86_64.yml => CentOS-7-default.yml} (100%)
 rename vars/{CentOS-8-x86_64.yml => CentOS-8-default.yml} (100%)
 rename vars/{Fedora-29-x86_64.yml => Fedora-29-default.yml} (100%)
 rename vars/{Fedora-30-x86_64.yml => Fedora-30-default.yml} (100%)
 rename vars/{Fedora-31-x86_64.yml => Fedora-31-default.yml} (100%)
 create mode 100644 vars/Fedora-32-default.yml
 create mode 100644 vars/Fedora-33-default.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index c0fe681..9630ea8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -49,6 +49,7 @@
     - ensure_repo_rpmfusion.package_list is iterable
     - packages[item.name] is not defined
   ansible.builtin.package:
+    disable_gpg_check: '{{ item.disable_gpg_check | omit(default) }}'
     name: '{{ item.url }}'
     state: '{{ item.state }}'
   loop: '{{ ensure_repo_rpmfusion.package_list }}'
diff --git a/vars/CentOS-6-i386.yml b/vars/CentOS-6-default.yml
similarity index 100%
rename from vars/CentOS-6-i386.yml
rename to vars/CentOS-6-default.yml
diff --git a/vars/CentOS-6-x86_64.yml b/vars/CentOS-6-x86_64.yml
deleted file mode 100644
index 0119cd5..0000000
--- a/vars/CentOS-6-x86_64.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# vars file for ensure_repo_rpmfusion
-requirements_package_list:
-  - name: 'pyOpenSSL'
-    state: 'present'
-  - name: 'python-pyasn1'
-    state: 'present'
-  - name: 'python-urllib3'
-    state: 'present'
-  - name: 'python2-ndg_httpsclient'
-    state: 'present'
-package_list:
-  - name: 'rpmfusion-free-release'
-    state: 'present'
-    url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm'
-  - name: 'rpmfusion-nonfree-release'
-    state: 'present'
-    url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-6.noarch.rpm'
-
diff --git a/vars/CentOS-7-x86_64.yml b/vars/CentOS-7-default.yml
similarity index 100%
rename from vars/CentOS-7-x86_64.yml
rename to vars/CentOS-7-default.yml
diff --git a/vars/CentOS-8-x86_64.yml b/vars/CentOS-8-default.yml
similarity index 100%
rename from vars/CentOS-8-x86_64.yml
rename to vars/CentOS-8-default.yml
diff --git a/vars/Fedora-29-x86_64.yml b/vars/Fedora-29-default.yml
similarity index 100%
rename from vars/Fedora-29-x86_64.yml
rename to vars/Fedora-29-default.yml
diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30-default.yml
similarity index 100%
rename from vars/Fedora-30-x86_64.yml
rename to vars/Fedora-30-default.yml
diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31-default.yml
similarity index 100%
rename from vars/Fedora-31-x86_64.yml
rename to vars/Fedora-31-default.yml
diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml
new file mode 100644
index 0000000..6a1edfc
--- /dev/null
+++ b/vars/Fedora-32-default.yml
@@ -0,0 +1,10 @@
+---
+# vars file for ensure_repo_rpmfusion
+package_list:
+  - name: 'rpmfusion-free-release'
+    state: 'present'
+    url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-32.noarch.rpm'
+  - name: 'rpmfusion-nonfree-release'
+    state: 'present'
+    url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-32.noarch.rpm'
+
diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml
new file mode 100644
index 0000000..78c5894
--- /dev/null
+++ b/vars/Fedora-33-default.yml
@@ -0,0 +1,10 @@
+---
+# vars file for ensure_repo_rpmfusion
+package_list:
+  - name: 'rpmfusion-free-release'
+    state: 'present'
+    url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm'
+  - name: 'rpmfusion-nonfree-release'
+    state: 'present'
+    url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-33.noarch.rpm'
+