From b9f7b64a0bd6cfe054663416d6db11ca7f36a224 Mon Sep 17 00:00:00 2001 From: AnsibleRoles <> Date: Mon, 30 Dec 2019 21:36:52 +0000 Subject: [PATCH 01/33] Initial commit --- .gitignore | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 ++ 2 files changed, 92 insertions(+) create mode 100644 .gitignore create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6caeae7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,90 @@ +# ---> Ansible +*.retry + +# ---> Vim +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# ---> Linux +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# ---> Windows +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ---> macOS +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + diff --git a/README.md b/README.md new file mode 100644 index 0000000..bcd9787 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ensure_repo_rpmfusion + From 0c574875cde7b32fc7f321c306583d59cf9678a0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 30 Dec 2019 16:41:27 -0600 Subject: [PATCH 02/33] Deploy rpmfusion on EL and Fedora distro for supported versions --- .gitignore | 75 +++++++++++++++++++++------------------ .travis.yml | 29 +++++++++++++++ README.md | 38 +++++++++++++++++++- defaults/main.yml | 2 ++ handlers/main.yml | 7 ++++ meta/main.yml | 53 +++++++++++++++++++++++++++ tasks/main.yml | 61 +++++++++++++++++++++++++++++++ tests/inventory | 2 ++ tests/test.yml | 5 +++ vars/Fedora-29-x86_64.yml | 6 ++++ vars/Fedora-30-x86_64.yml | 6 ++++ vars/Fedora-31-x86_64.yml | 6 ++++ vars/RedHat-6-i386.yml | 11 ++++++ vars/RedHat-6-x86_64.yml | 11 ++++++ vars/RedHat-7-x86_64.yml | 6 ++++ vars/RedHat-8-x86_64.yml | 6 ++++ vars/default.yml | 2 ++ vars/main.yml | 2 ++ 18 files changed, 293 insertions(+), 35 deletions(-) create mode 100644 .travis.yml create mode 100644 defaults/main.yml create mode 100644 handlers/main.yml create mode 100644 meta/main.yml create mode 100644 tasks/main.yml create mode 100644 tests/inventory create mode 100644 tests/test.yml create mode 100644 vars/Fedora-29-x86_64.yml create mode 100644 vars/Fedora-30-x86_64.yml create mode 100644 vars/Fedora-31-x86_64.yml create mode 100644 vars/RedHat-6-i386.yml create mode 100644 vars/RedHat-6-x86_64.yml create mode 100644 vars/RedHat-7-x86_64.yml create mode 100644 vars/RedHat-8-x86_64.yml create mode 100644 vars/default.yml create mode 100644 vars/main.yml diff --git a/.gitignore b/.gitignore index 6caeae7..ce59d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,6 @@ # ---> Ansible *.retry -# ---> Vim -# Swap -[._]*.s[a-v][a-z] -[._]*.sw[a-p] -[._]s[a-rt-v][a-z] -[._]ss[a-gi-z] -[._]sw[a-p] - -# Session -Session.vim - -# Temporary -.netrwhist -*~ -# Auto-generated tag files -tags -# Persistent undo -[._]*.un~ - -# ---> Linux -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - # ---> Windows # Windows thumbnail cache files Thumbs.db @@ -88,3 +54,44 @@ Network Trash Folder Temporary Items .apdisk +# ---> Linux +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# ---> Vim +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# ---> VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/README.md b/README.md index bcd9787..4d153b9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,38 @@ -# ensure_repo_rpmfusion +Role Name +========= +Deploy RPMFusion for EL/Fedora + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +LGPL >= 3 + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..2857337 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for ensure_repo_rpmfusion \ No newline at end of file diff --git a/handlers/main.yml b/handlers/main.yml new file mode 100644 index 0000000..f836c2d --- /dev/null +++ b/handlers/main.yml @@ -0,0 +1,7 @@ +--- +# handlers file for ensure_repo_rpmfusion +- name: 'ensure_repo_rpmfusion.package_facts' + package_facts: +- name: 'ensure_repo_rpmfusion.service_facts' + service_facts: + diff --git a/meta/main.yml b/meta/main.yml new file mode 100644 index 0000000..227ad9c --- /dev/null +++ b/meta/main.yml @@ -0,0 +1,53 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.9 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. + \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml new file mode 100644 index 0000000..ae2d5f6 --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,61 @@ +--- +# tasks file for ensure_repo_rpmfusion +- name: 'include variables' + when: + - ansible_system == 'Linux' + include_vars: + file: '{{ lookup("first_found", findme ) }}' + name: 'ensure_repo_rpmfusion' + vars: + findme: + files: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_distribution }}-default.yml' + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_os_family }}-default.yml' + - 'default.yml' + paths: + - '../vars/' + errors: 'ignore' +- name: 'package discovery' + when: + - ansible_system == 'Linux' + - packages is not defined + package_facts: +- name: 'ensure packages' + when: + - ansible_system == 'Linux' + - ensure_repo_rpmfusion is defined + - ensure_repo_rpmfusion.requirements_package_list is defined + - ensure_repo_rpmfusion.requirements_package_list is iterable + - packages[item.name] is not defined + package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_repo_rpmfusion.package_facts' + - 'ensure_repo_rpmfusion.service_facts' +- name: 'ensure packages' + when: + - ansible_system == 'Linux' + - ensure_repo_rpmfusion is defined + - ensure_repo_rpmfusion.package_list is defined + - ensure_repo_rpmfusion.package_list is iterable + - packages[item.name] is not defined + package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_repo_rpmfusion.package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_repo_rpmfusion.package_facts' + - 'ensure_repo_rpmfusion.service_facts' +- name: 'flush handlers' + meta: 'flush_handlers' + diff --git a/tests/inventory b/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/tests/test.yml b/tests/test.yml new file mode 100644 index 0000000..b1b8ed2 --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - ensure_repo_rpmfusion \ No newline at end of file diff --git a/vars/Fedora-29-x86_64.yml b/vars/Fedora-29-x86_64.yml new file mode 100644 index 0000000..2e6efcc --- /dev/null +++ b/vars/Fedora-29-x86_64.yml @@ -0,0 +1,6 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-29.noarch.rpm' } + - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-29.noarch.rpm' } + diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30-x86_64.yml new file mode 100644 index 0000000..53e214a --- /dev/null +++ b/vars/Fedora-30-x86_64.yml @@ -0,0 +1,6 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm' } + - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-30.noarch.rpm' } + diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31-x86_64.yml new file mode 100644 index 0000000..391baab --- /dev/null +++ b/vars/Fedora-31-x86_64.yml @@ -0,0 +1,6 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm' } + - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-31.noarch.rpm' } + diff --git a/vars/RedHat-6-i386.yml b/vars/RedHat-6-i386.yml new file mode 100644 index 0000000..adde761 --- /dev/null +++ b/vars/RedHat-6-i386.yml @@ -0,0 +1,11 @@ +--- +# 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/RedHat-6-x86_64.yml b/vars/RedHat-6-x86_64.yml new file mode 100644 index 0000000..adde761 --- /dev/null +++ b/vars/RedHat-6-x86_64.yml @@ -0,0 +1,11 @@ +--- +# 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/RedHat-7-x86_64.yml b/vars/RedHat-7-x86_64.yml new file mode 100644 index 0000000..e9f18d2 --- /dev/null +++ b/vars/RedHat-7-x86_64.yml @@ -0,0 +1,6 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' } + - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' } + diff --git a/vars/RedHat-8-x86_64.yml b/vars/RedHat-8-x86_64.yml new file mode 100644 index 0000000..4ee175f --- /dev/null +++ b/vars/RedHat-8-x86_64.yml @@ -0,0 +1,6 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' } + - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' } + diff --git a/vars/default.yml b/vars/default.yml new file mode 100644 index 0000000..0a9d6d9 --- /dev/null +++ b/vars/default.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_repo_rpmfusion \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..0a9d6d9 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_repo_rpmfusion \ No newline at end of file From 9bf9244bfcbc522ad7e75c56395afd5d60e73cd2 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 30 Dec 2019 20:30:42 -0600 Subject: [PATCH 03/33] Install by url not name --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index ae2d5f6..ffde729 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -48,7 +48,7 @@ - ensure_repo_rpmfusion.package_list is iterable - packages[item.name] is not defined package: - name: '{{ item.name }}' + name: '{{ item.url }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.package_list }}' loop_control: From 1d3e7d79c1abbef623c096282baa8465f4fe09e1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 28 Mar 2020 17:46:11 -0500 Subject: [PATCH 04/33] Galaxy Metadata update --- meta/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 227ad9c..27827e3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,6 @@ galaxy_info: - author: your name - description: your role description + author: Jason Rothstein + description: Deploy RPM Fusion repo company: your company (optional) # If the issue tracker for your role is not on github, uncomment the @@ -14,7 +14,7 @@ galaxy_info: # - GPL-3.0-only # - Apache-2.0 # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) + license: LGPL-3.0-or-later min_ansible_version: 2.9 From d98ddda66655dfa555a370f65239ea3386e2e462 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 28 Mar 2020 17:49:23 -0500 Subject: [PATCH 05/33] Make dictionaries matainable --- vars/Fedora-29-x86_64.yml | 8 ++++++-- vars/Fedora-30-x86_64.yml | 8 ++++++-- vars/Fedora-31-x86_64.yml | 8 ++++++-- vars/RedHat-6-i386.yml | 20 ++++++++++++++------ vars/RedHat-6-x86_64.yml | 20 ++++++++++++++------ vars/RedHat-7-x86_64.yml | 8 ++++++-- vars/RedHat-8-x86_64.yml | 8 ++++++-- 7 files changed, 58 insertions(+), 22 deletions(-) diff --git a/vars/Fedora-29-x86_64.yml b/vars/Fedora-29-x86_64.yml index 2e6efcc..50f75ae 100644 --- a/vars/Fedora-29-x86_64.yml +++ b/vars/Fedora-29-x86_64.yml @@ -1,6 +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-29.noarch.rpm' } - - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-29.noarch.rpm' } + - name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-29.noarch.rpm' + - name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-29.noarch.rpm' diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30-x86_64.yml index 53e214a..d8e8dc1 100644 --- a/vars/Fedora-30-x86_64.yml +++ b/vars/Fedora-30-x86_64.yml @@ -1,6 +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-30.noarch.rpm' } - - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-30.noarch.rpm' } + - name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm' + - name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-30.noarch.rpm' diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31-x86_64.yml index 391baab..e9c98a3 100644 --- a/vars/Fedora-31-x86_64.yml +++ b/vars/Fedora-31-x86_64.yml @@ -1,6 +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-31.noarch.rpm' } - - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-31.noarch.rpm' } + - name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm' + - name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-31.noarch.rpm' diff --git a/vars/RedHat-6-i386.yml b/vars/RedHat-6-i386.yml index adde761..0119cd5 100644 --- a/vars/RedHat-6-i386.yml +++ b/vars/RedHat-6-i386.yml @@ -1,11 +1,19 @@ --- # 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' } + - 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' } + - 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/RedHat-6-x86_64.yml b/vars/RedHat-6-x86_64.yml index adde761..0119cd5 100644 --- a/vars/RedHat-6-x86_64.yml +++ b/vars/RedHat-6-x86_64.yml @@ -1,11 +1,19 @@ --- # 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' } + - 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' } + - 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/RedHat-7-x86_64.yml b/vars/RedHat-7-x86_64.yml index e9f18d2..950c6eb 100644 --- a/vars/RedHat-7-x86_64.yml +++ b/vars/RedHat-7-x86_64.yml @@ -1,6 +1,10 @@ --- # vars file for ensure_repo_rpmfusion package_list: - - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' } - - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' } + - name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' + - name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' diff --git a/vars/RedHat-8-x86_64.yml b/vars/RedHat-8-x86_64.yml index 4ee175f..4eff90a 100644 --- a/vars/RedHat-8-x86_64.yml +++ b/vars/RedHat-8-x86_64.yml @@ -1,6 +1,10 @@ --- # vars file for ensure_repo_rpmfusion package_list: - - { name: 'rpmfusion-free-release', state: 'present', url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' } - - { name: 'rpmfusion-nonfree-release', state: 'present', url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' } + - name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' + - name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' From a6d1e5fe60457680487d57d995e9494efac527b0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 29 Nov 2020 21:50:56 -0600 Subject: [PATCH 06/33] Be specific about OS Vendors --- README.md | 2 +- handlers/main.yml | 4 ++-- tasks/main.yml | 6 +++--- vars/{RedHat-6-i386.yml => CentOS-6-i386.yml} | 0 vars/{RedHat-6-x86_64.yml => CentOS-6-x86_64.yml} | 0 vars/{RedHat-7-x86_64.yml => CentOS-7-x86_64.yml} | 0 vars/{RedHat-8-x86_64.yml => CentOS-8-x86_64.yml} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename vars/{RedHat-6-i386.yml => CentOS-6-i386.yml} (100%) rename vars/{RedHat-6-x86_64.yml => CentOS-6-x86_64.yml} (100%) rename vars/{RedHat-7-x86_64.yml => CentOS-7-x86_64.yml} (100%) rename vars/{RedHat-8-x86_64.yml => CentOS-8-x86_64.yml} (100%) diff --git a/README.md b/README.md index 4d153b9..1d87ca0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe License ------- -LGPL >= 3 +LGPL-3.0-or-later Author Information ------------------ diff --git a/handlers/main.yml b/handlers/main.yml index f836c2d..d04233b 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,7 +1,7 @@ --- # handlers file for ensure_repo_rpmfusion - name: 'ensure_repo_rpmfusion.package_facts' - package_facts: + ansible.builtin.package_facts: - name: 'ensure_repo_rpmfusion.service_facts' - service_facts: + ansible.builtin.service_facts: diff --git a/tasks/main.yml b/tasks/main.yml index ffde729..bcc15ce 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,7 +23,7 @@ when: - ansible_system == 'Linux' - packages is not defined - package_facts: + ansible.builtin.package_facts: - name: 'ensure packages' when: - ansible_system == 'Linux' @@ -31,7 +31,7 @@ - ensure_repo_rpmfusion.requirements_package_list is defined - ensure_repo_rpmfusion.requirements_package_list is iterable - packages[item.name] is not defined - package: + ansible.builtin.package: name: '{{ item.name }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' @@ -47,7 +47,7 @@ - ensure_repo_rpmfusion.package_list is defined - ensure_repo_rpmfusion.package_list is iterable - packages[item.name] is not defined - package: + ansible.builtin.package: name: '{{ item.url }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.package_list }}' diff --git a/vars/RedHat-6-i386.yml b/vars/CentOS-6-i386.yml similarity index 100% rename from vars/RedHat-6-i386.yml rename to vars/CentOS-6-i386.yml diff --git a/vars/RedHat-6-x86_64.yml b/vars/CentOS-6-x86_64.yml similarity index 100% rename from vars/RedHat-6-x86_64.yml rename to vars/CentOS-6-x86_64.yml diff --git a/vars/RedHat-7-x86_64.yml b/vars/CentOS-7-x86_64.yml similarity index 100% rename from vars/RedHat-7-x86_64.yml rename to vars/CentOS-7-x86_64.yml diff --git a/vars/RedHat-8-x86_64.yml b/vars/CentOS-8-x86_64.yml similarity index 100% rename from vars/RedHat-8-x86_64.yml rename to vars/CentOS-8-x86_64.yml From 3fbb29ec47b7c43b09692509a1b0e4bb254caff5 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 15:42:25 -0600 Subject: [PATCH 07/33] Allow CentOS 8 to disable GPG check to install the repo --- tasks/main.yml | 1 + vars/CentOS-8-x86_64.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index bcc15ce..4f61abd 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,6 +32,7 @@ - ensure_repo_rpmfusion.requirements_package_list is iterable - packages[item.name] is not defined ansible.builtin.package: + disable_gpg_check: '{{ item.disable_gpg_check | omit(no) }}' name: '{{ item.name }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' diff --git a/vars/CentOS-8-x86_64.yml b/vars/CentOS-8-x86_64.yml index 4eff90a..30b011d 100644 --- a/vars/CentOS-8-x86_64.yml +++ b/vars/CentOS-8-x86_64.yml @@ -2,9 +2,11 @@ # vars file for ensure_repo_rpmfusion package_list: - name: 'rpmfusion-free-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' - name: 'rpmfusion-nonfree-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' From 047a2085070215931b140ed565db11b60429431a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 16:35:19 -0600 Subject: [PATCH 08/33] Make disable_gpg_check default unless overridden --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4f61abd..c0fe681 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,7 +32,7 @@ - ensure_repo_rpmfusion.requirements_package_list is iterable - packages[item.name] is not defined ansible.builtin.package: - disable_gpg_check: '{{ item.disable_gpg_check | omit(no) }}' + disable_gpg_check: '{{ item.disable_gpg_check | omit(default) }}' name: '{{ item.name }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' From 98bf037636fe21aa1569e53e4ab6769333c06ca0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 20:31:24 -0600 Subject: [PATCH 09/33] 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' + From 2b125364b47c49600b87ece06e02072da34be619 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 21:13:20 -0600 Subject: [PATCH 10/33] Fix the default(omit) syntax --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 9630ea8..e02ff68 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,7 +32,7 @@ - ensure_repo_rpmfusion.requirements_package_list is iterable - packages[item.name] is not defined ansible.builtin.package: - disable_gpg_check: '{{ item.disable_gpg_check | omit(default) }}' + disable_gpg_check: '{{ item.disable_gpg_check | default(omit) }}' name: '{{ item.name }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' @@ -49,7 +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) }}' + disable_gpg_check: '{{ item.disable_gpg_check | default(omit) }}' name: '{{ item.url }}' state: '{{ item.state }}' loop: '{{ ensure_repo_rpmfusion.package_list }}' From 7a1b1a74cd4841a75a84002f10955af80a86156b Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 21:33:23 -0600 Subject: [PATCH 11/33] Ignore GPG for Fedora 33 --- vars/Fedora-33-default.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml index 78c5894..ce556f2 100644 --- a/vars/Fedora-33-default.yml +++ b/vars/Fedora-33-default.yml @@ -2,9 +2,11 @@ # vars file for ensure_repo_rpmfusion package_list: - name: 'rpmfusion-free-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm' - name: 'rpmfusion-nonfree-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-33.noarch.rpm' From ac4f2e19ed50dc95bae56094ad6599614de7e521 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 6 Dec 2020 21:51:42 -0600 Subject: [PATCH 12/33] Fedora 32 should ignore the gpg check on package install --- vars/Fedora-32-default.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml index 6a1edfc..cb2eddc 100644 --- a/vars/Fedora-32-default.yml +++ b/vars/Fedora-32-default.yml @@ -2,9 +2,11 @@ # vars file for ensure_repo_rpmfusion package_list: - name: 'rpmfusion-free-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-32.noarch.rpm' - name: 'rpmfusion-nonfree-release' + disable_gpg_check: 'yes' state: 'present' url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-32.noarch.rpm' From c1884d8e09fc0a531a647fbb71f5e7e81cf3c03b Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 7 Dec 2020 05:56:19 -0600 Subject: [PATCH 13/33] Sort the keys --- vars/CentOS-8-default.yml | 8 ++++---- vars/Fedora-32-default.yml | 8 ++++---- vars/Fedora-33-default.yml | 8 ++++---- vars/main.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index 30b011d..31c5f89 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -1,12 +1,12 @@ --- # vars file for ensure_repo_rpmfusion package_list: - - name: 'rpmfusion-free-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' state: 'present' url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' - - name: 'rpmfusion-nonfree-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' state: 'present' url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-8.noarch.rpm' diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml index cb2eddc..3559e3c 100644 --- a/vars/Fedora-32-default.yml +++ b/vars/Fedora-32-default.yml @@ -1,12 +1,12 @@ --- # vars file for ensure_repo_rpmfusion package_list: - - name: 'rpmfusion-free-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' state: 'present' url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-32.noarch.rpm' - - name: 'rpmfusion-nonfree-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + 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 index ce556f2..0266ba1 100644 --- a/vars/Fedora-33-default.yml +++ b/vars/Fedora-33-default.yml @@ -1,12 +1,12 @@ --- # vars file for ensure_repo_rpmfusion package_list: - - name: 'rpmfusion-free-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' state: 'present' url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm' - - name: 'rpmfusion-nonfree-release' - disable_gpg_check: 'yes' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' state: 'present' url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-33.noarch.rpm' diff --git a/vars/main.yml b/vars/main.yml index 0a9d6d9..56e2119 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_repo_rpmfusion \ No newline at end of file +# vars file for ensure_repo_rpmfusion From bce2321f37466e6c0e9c265b1a423ec766d2b12e Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 20 Dec 2020 07:44:31 -0600 Subject: [PATCH 14/33] Do service discovery as well as package discovery --- tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index e02ff68..186afdb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -24,6 +24,11 @@ - ansible_system == 'Linux' - packages is not defined ansible.builtin.package_facts: +- name: 'service discovery' + when: + - ansible_system == 'Linux' + - services is not defined + ansible.builtin.service_facts: - name: 'ensure packages' when: - ansible_system == 'Linux' From 96422490b4f3a4567e5f577b1021e45cea19f136 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 29 Jun 2021 20:28:35 -0500 Subject: [PATCH 15/33] Enable Fedora 34 --- vars/Fedora-34-default.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 vars/Fedora-34-default.yml diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml new file mode 100644 index 0000000..52324db --- /dev/null +++ b/vars/Fedora-34-default.yml @@ -0,0 +1,12 @@ +--- +# 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-34.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' + From e51df84af3f5c21c569df4ec5f2c3bea6e6351b5 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 Jul 2021 03:58:08 +0000 Subject: [PATCH 16/33] Enable possibility of services --- tasks/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index 186afdb..4430620 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -63,6 +63,16 @@ notify: - 'ensure_repo_rpmfusion.package_facts' - 'ensure_repo_rpmfusion.service_facts' + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_repo_rpmfusion.service_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_repo_rpmfusion.package_facts' + - 'ensure_repo_rpmfusion.service_facts' - name: 'flush handlers' meta: 'flush_handlers' From 700944c9d8a40749c9ae621cdb670f8bc0750e78 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 Jul 2021 04:14:50 +0000 Subject: [PATCH 17/33] Missing code --- tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index 4430620..8e0b33f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -63,6 +63,12 @@ notify: - 'ensure_repo_rpmfusion.package_facts' - 'ensure_repo_rpmfusion.service_facts' +- name: 'ensure services' + when: + - ansible_system == 'Linux' + - ensure_repo_rpmfusion is defined + - ensure_repo_rpmfusion.service_list is defined + - ensure_repo_rpmfusion.service_list is iterable ansible.builtin.service: enabled: '{{ item.enabled }}' name: '{{ item.name }}' From 069d8b277947157f982980d6d5a992eafc1550f1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 7 Nov 2021 22:57:10 -0600 Subject: [PATCH 18/33] 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' From 0bff06462650590a79e85e217cd5a73ad2216597 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:30:07 -0500 Subject: [PATCH 19/33] Update handlers --- handlers/main.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index d04233b..8c8c503 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,4 +4,24 @@ ansible.builtin.package_facts: - name: 'ensure_repo_rpmfusion.service_facts' ansible.builtin.service_facts: - +- name: 'ensure_repo_rpmfusion.service_reload' + when: + - ansible_system == 'Linux' + - ansible_service_mgr == 'systemd' + - ensure_repo_rpmfusion is defined + ansible.builtin.systemd: + daemon_reload: 'yes' +- name: 'ensure_repo_rpmfusion.services' + when: + - ansible_system == 'Linux' + - ensure_repo_rpmfusion is defined + - ensure_repo_rpmfusion.service_list is defined + - ensure_repo_rpmfusion.service_list is iterable + - item.state == 'started' + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: 'restarted' + loop: '{{ ensure_repo_rpmfusion.service_list }}' + loop_control: + label: '{{ item.name }} will be restarted' From a97fd115542aecbe021dce20b616340909c4c338 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 18:23:37 -0500 Subject: [PATCH 20/33] Enable Fedora 36 --- vars/Fedora-36-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-36-default.yml diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-36-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' From 90f9eed0490d0d454db73e6031cf166c35ce7b20 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 6 Dec 2022 21:34:28 -0600 Subject: [PATCH 21/33] Add Fedora 37 --- vars/Fedora-37-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-37-default.yml diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-37-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' From 1080ab5e42bc8405796b7bb6e48bcd435f121029 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 23 Apr 2023 16:40:20 -0500 Subject: [PATCH 22/33] Add CentOS 9 and Fedora 38 --- vars/CentOS-7-default.yml | 4 ++-- vars/CentOS-8-default.yml | 4 ++-- vars/CentOS-9-default.yml | 12 ++++++++++++ vars/Fedora-38-default.yml | 11 +++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 vars/CentOS-9-default.yml create mode 100644 vars/Fedora-38-default.yml diff --git a/vars/CentOS-7-default.yml b/vars/CentOS-7-default.yml index 950c6eb..67df992 100644 --- a/vars/CentOS-7-default.yml +++ b/vars/CentOS-7-default.yml @@ -3,8 +3,8 @@ package_list: - name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index 31c5f89..5330b38 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-8.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/CentOS-9-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-38-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' From d83b6471a60bb7654b7006095439a499af145313 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 16 Mar 2024 21:04:53 -0500 Subject: [PATCH 23/33] Add Fedora 39 --- vars/Fedora-39-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-39-default.yml diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-39-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' From 4d0a704c23b55ef60f7a79d962dbb9b93c205b00 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 2 Jun 2024 12:26:12 -0500 Subject: [PATCH 24/33] Fedora 40 support Signed-off-by: Jason Rothstein --- vars/Fedora-40-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-40-default.yml diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-40-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' From cc9e96de8dd43f969ebf9b37adb6d85261dd0ccf Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Fri, 27 Dec 2024 16:17:36 -0600 Subject: [PATCH 25/33] Fedora 41 Signed-off-by: Jason Rothstein --- vars/Fedora-41-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-41-default.yml diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-41-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' From cb9b788fb8c0f21a3e07d36ce5600478a6c41d5a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 27 Apr 2025 12:47:30 -0500 Subject: [PATCH 26/33] Fedora 42 Signed-off-by: Jason Rothstein --- vars/Fedora-42-default.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vars/Fedora-42-default.yml diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-42-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' From 2c4486c599d7b4b4b72bf4f3cf3f7f3059fe5007 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 May 2025 20:13:31 -0500 Subject: [PATCH 27/33] Hanlder improvements Signed-off-by: Jason Rothstein --- handlers/main.yml | 4 +++- tasks/main.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 8c8c503..aa4c69c 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -11,7 +11,7 @@ - ensure_repo_rpmfusion is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_repo_rpmfusion.services' +- name: 'ensure_repo_rpmfusion.service_restart' when: - ansible_system == 'Linux' - ensure_repo_rpmfusion is defined @@ -25,3 +25,5 @@ loop: '{{ ensure_repo_rpmfusion.service_list }}' loop_control: label: '{{ item.name }} will be restarted' +... + diff --git a/tasks/main.yml b/tasks/main.yml index 8e0b33f..ad9b0e8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -81,4 +81,5 @@ - 'ensure_repo_rpmfusion.service_facts' - name: 'flush handlers' meta: 'flush_handlers' +... From d316bc5a2e3ac7f7bb7acfdbd972b3b1f861e62d Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Thu, 30 Apr 2026 19:43:39 -0500 Subject: [PATCH 28/33] Add Fedora 43, 44, Alma 9, 10, CentOS 10, Oracle 9, 10, Rocky 9, 10 Signed-off-by: Jason Rothstein --- vars/AlmaLinux-10-default.yml | 12 ++++++++++++ vars/AlmaLinux-9-default.yml | 12 ++++++++++++ vars/CentOS-10-default.yml | 12 ++++++++++++ vars/Fedora-43-default.yml | 11 +++++++++++ vars/Fedora-44-default.yml | 11 +++++++++++ vars/OracleLinux-10-default.yml | 12 ++++++++++++ vars/OracleLinux-9-default.yml | 12 ++++++++++++ vars/Rocky-10-default.yml | 12 ++++++++++++ vars/Rocky-9-default.yml | 12 ++++++++++++ 9 files changed, 106 insertions(+) create mode 100644 vars/AlmaLinux-10-default.yml create mode 100644 vars/AlmaLinux-9-default.yml create mode 100644 vars/CentOS-10-default.yml create mode 100644 vars/Fedora-43-default.yml create mode 100644 vars/Fedora-44-default.yml create mode 100644 vars/OracleLinux-10-default.yml create mode 100644 vars/OracleLinux-9-default.yml create mode 100644 vars/Rocky-10-default.yml create mode 100644 vars/Rocky-9-default.yml diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/AlmaLinux-10-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/AlmaLinux-9-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/CentOS-10-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-43-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' diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml new file mode 100644 index 0000000..fd37936 --- /dev/null +++ b/vars/Fedora-44-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' diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/OracleLinux-10-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..5330b38 --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/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/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + From e2f86bbb4401ccce7982f4c4f74b5c2638e0ffd1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 3 May 2026 01:04:27 -0500 Subject: [PATCH 29/33] Fix package_list name Signed-off-by: Jason Rothstein --- tasks/main.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index ad9b0e8..057303c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,23 +29,6 @@ - ansible_system == 'Linux' - services is not defined ansible.builtin.service_facts: -- name: 'ensure packages' - when: - - ansible_system == 'Linux' - - ensure_repo_rpmfusion is defined - - ensure_repo_rpmfusion.requirements_package_list is defined - - ensure_repo_rpmfusion.requirements_package_list is iterable - - packages[item.name] is not defined - ansible.builtin.package: - disable_gpg_check: '{{ item.disable_gpg_check | default(omit) }}' - name: '{{ item.name }}' - state: '{{ item.state }}' - loop: '{{ ensure_repo_rpmfusion.requirements_package_list }}' - loop_control: - label: '{{ item.name }} will be {{ item.state }}' - notify: - - 'ensure_repo_rpmfusion.package_facts' - - 'ensure_repo_rpmfusion.service_facts' - name: 'ensure packages' when: - ansible_system == 'Linux' From 14aaa3c7232122f80c5f49795686faea83a1a4b9 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 14:12:48 -0500 Subject: [PATCH 30/33] Fix ansible core 2.20 and supported OS list Signed-off-by: Jason Rothstein --- tasks/main.yml | 22 +++++++++++----------- vars/AlmaLinux-10-default.yml | 4 ++-- vars/AlmaLinux-8-default.yml | 12 ++++++++++++ vars/AlmaLinux-9-default.yml | 4 ++-- vars/CentOS-10-default.yml | 4 ++-- vars/CentOS-6-default.yml | 19 ------------------- vars/CentOS-7-default.yml | 10 ---------- vars/CentOS-8-default.yml | 4 ++-- vars/CentOS-9-default.yml | 4 ++-- vars/Fedora-29-default.yml | 9 --------- vars/Fedora-30-default.yml | 9 --------- vars/Fedora-31-default.yml | 9 --------- vars/Fedora-32-default.yml | 11 ----------- vars/Fedora-33-default.yml | 11 ----------- vars/Fedora-34-default.yml | 11 ----------- vars/Fedora-35-default.yml | 11 ----------- vars/Fedora-36-default.yml | 11 ----------- vars/Fedora-37-default.yml | 11 ----------- vars/Fedora-38-default.yml | 11 ----------- vars/Fedora-39-default.yml | 11 ----------- vars/Fedora-40-default.yml | 11 ----------- vars/Fedora-41-default.yml | 11 ----------- vars/Fedora-42-default.yml | 4 ++-- vars/Fedora-43-default.yml | 4 ++-- vars/Fedora-44-default.yml | 4 ++-- vars/OracleLinux-10-default.yml | 4 ++-- vars/OracleLinux-8-default.yml | 12 ++++++++++++ vars/OracleLinux-9-default.yml | 4 ++-- vars/Rocky-10-default.yml | 4 ++-- vars/Rocky-8-default.yml | 12 ++++++++++++ vars/Rocky-9-default.yml | 4 ++-- 31 files changed, 71 insertions(+), 201 deletions(-) create mode 100644 vars/AlmaLinux-8-default.yml delete mode 100644 vars/CentOS-6-default.yml delete mode 100644 vars/CentOS-7-default.yml delete mode 100644 vars/Fedora-29-default.yml delete mode 100644 vars/Fedora-30-default.yml delete mode 100644 vars/Fedora-31-default.yml delete mode 100644 vars/Fedora-32-default.yml delete mode 100644 vars/Fedora-33-default.yml delete mode 100644 vars/Fedora-34-default.yml delete mode 100644 vars/Fedora-35-default.yml delete mode 100644 vars/Fedora-36-default.yml delete mode 100644 vars/Fedora-37-default.yml delete mode 100644 vars/Fedora-38-default.yml delete mode 100644 vars/Fedora-39-default.yml delete mode 100644 vars/Fedora-40-default.yml delete mode 100644 vars/Fedora-41-default.yml create mode 100644 vars/OracleLinux-8-default.yml create mode 100644 vars/Rocky-8-default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 057303c..92c190a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,18 +2,18 @@ # tasks file for ensure_repo_rpmfusion - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_repo_rpmfusion' vars: findme: files: - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_distribution }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - '{{ ansible_os_family }}-default.yml' - 'default.yml' paths: @@ -21,17 +21,17 @@ errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' - - packages is not defined + - ansible_facts["system"] == 'Linux' + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - services is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined - ensure_repo_rpmfusion.package_list is defined - ensure_repo_rpmfusion.package_list is iterable @@ -48,7 +48,7 @@ - 'ensure_repo_rpmfusion.service_facts' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined - ensure_repo_rpmfusion.service_list is defined - ensure_repo_rpmfusion.service_list is iterable diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml index 5330b38..ac6b851 100644 --- a/vars/AlmaLinux-10-default.yml +++ b/vars/AlmaLinux-10-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml new file mode 100644 index 0000000..ac6b851 --- /dev/null +++ b/vars/AlmaLinux-8-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml index 5330b38..ac6b851 100644 --- a/vars/AlmaLinux-9-default.yml +++ b/vars/AlmaLinux-9-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml index 5330b38..ac6b851 100644 --- a/vars/CentOS-10-default.yml +++ b/vars/CentOS-10-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/CentOS-6-default.yml b/vars/CentOS-6-default.yml deleted file mode 100644 index 0119cd5..0000000 --- a/vars/CentOS-6-default.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-default.yml b/vars/CentOS-7-default.yml deleted file mode 100644 index 67df992..0000000 --- a/vars/CentOS-7-default.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# vars file for ensure_repo_rpmfusion -package_list: - - name: 'rpmfusion-free-release' - state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' - - name: 'rpmfusion-nonfree-release' - state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' - diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index 5330b38..ac6b851 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml index 5330b38..ac6b851 100644 --- a/vars/CentOS-9-default.yml +++ b/vars/CentOS-9-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml deleted file mode 100644 index 1693c25..0000000 --- a/vars/Fedora-29-default.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# vars file for ensure_repo_rpmfusion -package_list: - - name: 'rpmfusion-free-release' - state: 'present' - 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-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml deleted file mode 100644 index 1693c25..0000000 --- a/vars/Fedora-30-default.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# vars file for ensure_repo_rpmfusion -package_list: - - name: 'rpmfusion-free-release' - state: 'present' - 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-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml deleted file mode 100644 index 1693c25..0000000 --- a/vars/Fedora-31-default.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# vars file for ensure_repo_rpmfusion -package_list: - - name: 'rpmfusion-free-release' - state: 'present' - 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-{{ ansible_distribution_major_version }}.noarch.rpm' diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-32-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-33-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-34-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-35-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-36-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-37-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml deleted file mode 100644 index fd37936..0000000 --- a/vars/Fedora-41-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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' diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml index fd37936..f79ad8f 100644 --- a/vars/Fedora-42-default.yml +++ b/vars/Fedora-42-default.yml @@ -4,8 +4,8 @@ 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' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["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' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml index fd37936..f79ad8f 100644 --- a/vars/Fedora-43-default.yml +++ b/vars/Fedora-43-default.yml @@ -4,8 +4,8 @@ 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' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["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' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml index fd37936..f79ad8f 100644 --- a/vars/Fedora-44-default.yml +++ b/vars/Fedora-44-default.yml @@ -4,8 +4,8 @@ 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' + url: 'https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts["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' + url: 'https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml index 5330b38..ac6b851 100644 --- a/vars/OracleLinux-10-default.yml +++ b/vars/OracleLinux-10-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml new file mode 100644 index 0000000..ac6b851 --- /dev/null +++ b/vars/OracleLinux-8-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml index 5330b38..ac6b851 100644 --- a/vars/OracleLinux-9-default.yml +++ b/vars/OracleLinux-9-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml index 5330b38..ac6b851 100644 --- a/vars/Rocky-10-default.yml +++ b/vars/Rocky-10-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..ac6b851 --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_repo_rpmfusion +package_list: + - disable_gpg_check: 'yes' + name: 'rpmfusion-free-release' + state: 'present' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + - disable_gpg_check: 'yes' + name: 'rpmfusion-nonfree-release' + state: 'present' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml index 5330b38..ac6b851 100644 --- a/vars/Rocky-9-default.yml +++ b/vars/Rocky-9-default.yml @@ -4,9 +4,9 @@ package_list: - disable_gpg_check: 'yes' name: 'rpmfusion-free-release' state: 'present' - url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' - disable_gpg_check: 'yes' name: 'rpmfusion-nonfree-release' state: 'present' - url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm' + url: 'https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_facts["distribution_major_version"] }}.noarch.rpm' From dc43680f0e18a5acb15b8479dcbe7300574b33d1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 15:02:32 -0500 Subject: [PATCH 31/33] More ansible core 2.20 fixes Signed-off-by: Jason Rothstein --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 92c190a..bac5320 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,10 +9,10 @@ vars: findme: files: - - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml' + - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - '{{ ansible_os_family }}-default.yml' - 'default.yml' From dd12b18aeeb70a58a30064cf92285bac386256b2 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 18:17:12 -0500 Subject: [PATCH 32/33] More ansible core 2.20 fixes Signed-off-by: Jason Rothstein --- handlers/main.yml | 6 +++--- tasks/main.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index aa4c69c..ced89ce 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,14 +6,14 @@ ansible.builtin.service_facts: - name: 'ensure_repo_rpmfusion.service_reload' when: - - ansible_system == 'Linux' - - ansible_service_mgr == 'systemd' + - ansible_facts["system"] == 'Linux' + - ansible_facts["service_mgr"] == 'systemd' - ensure_repo_rpmfusion is defined ansible.builtin.systemd: daemon_reload: 'yes' - name: 'ensure_repo_rpmfusion.service_restart' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_repo_rpmfusion is defined - ensure_repo_rpmfusion.service_list is defined - ensure_repo_rpmfusion.service_list is iterable diff --git a/tasks/main.yml b/tasks/main.yml index bac5320..7ff3421 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,9 +12,9 @@ - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - '{{ ansible_facts["distribution"] }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' - - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' - - '{{ ansible_os_family }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-default.yml' - 'default.yml' paths: - '../vars/' @@ -27,7 +27,7 @@ - name: 'service discovery' when: - ansible_facts["system"] == 'Linux' - - services is not defined + - ansible_facts["services"] is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: From 08c814c28758bf08dee46d056a8a687b0afeb42d Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 22:46:56 -0500 Subject: [PATCH 33/33] More ansible-core 2.20 fixes Signed-off-by: Jason Rothstein --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7ff3421..8662f62 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,7 +35,7 @@ - ensure_repo_rpmfusion is defined - ensure_repo_rpmfusion.package_list is defined - ensure_repo_rpmfusion.package_list is iterable - - packages[item.name] is not defined + - ansible_facts.packages[item.name] is not defined ansible.builtin.package: disable_gpg_check: '{{ item.disable_gpg_check | default(omit) }}' name: '{{ item.url }}'