From 0dcbfa41749c59448f90bc9c4fc848a07940120b Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 7 Nov 2021 22:57:10 -0600 Subject: [PATCH] Enable Fedora 35 and use variables instead of hard code version numbers --- vars/Fedora-29-default.yml | 5 ++--- vars/Fedora-30-default.yml | 5 ++--- vars/Fedora-31-default.yml | 5 ++--- vars/Fedora-32-default.yml | 5 ++--- vars/Fedora-33-default.yml | 5 ++--- vars/Fedora-34-default.yml | 5 ++--- vars/Fedora-35-default.yml | 11 +++++++++++ 7 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 vars/Fedora-35-default.yml diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml index 50f75ae..1693c25 100644 --- a/vars/Fedora-29-default.yml +++ b/vars/Fedora-29-default.yml @@ -3,8 +3,7 @@ package_list: - name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-29.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-29.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml index d8e8dc1..1693c25 100644 --- a/vars/Fedora-30-default.yml +++ b/vars/Fedora-30-default.yml @@ -3,8 +3,7 @@ package_list: - name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-30.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml index e9c98a3..1693c25 100644 --- a/vars/Fedora-31-default.yml +++ b/vars/Fedora-31-default.yml @@ -3,8 +3,7 @@ package_list: - name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-31.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml index 3559e3c..fd37936 100644 --- a/vars/Fedora-32-default.yml +++ b/vars/Fedora-32-default.yml @@ -4,9 +4,8 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-32.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-32.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml index 0266ba1..fd37936 100644 --- a/vars/Fedora-33-default.yml +++ b/vars/Fedora-33-default.yml @@ -4,9 +4,8 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-33.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml index 52324db..fd37936 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/Fedora-34-default.yml @@ -4,9 +4,8 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-34.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-34.noarch.rpm' - + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-35-default.yml @@ -0,0 +1,11 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm'