From e402df95cb222aaa1bd5f9900e1b56613df160a7 Mon Sep 17 00:00:00 2001 From: AnsibleRoles <> Date: Mon, 30 Nov 2020 05:05:22 +0000 Subject: [PATCH 01/32] Initial commit --- .gitignore | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE | 163 +++++++++++++++++++++ README.md | 2 + 3 files changed, 579 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c7056e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,414 @@ +# ---> Ansible +*.retry + +# ---> 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 + +# ---> 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* + +# ---> VisualStudio +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# ---> VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1344add --- /dev/null +++ b/LICENSE @@ -0,0 +1,163 @@ +GNU LESSER GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the terms +and conditions of version 3 of the GNU General Public License, supplemented +by the additional permissions listed below. + + 0. Additional Definitions. + + + +As used herein, "this License" refers to version 3 of the GNU Lesser General +Public License, and the "GNU GPL" refers to version 3 of the GNU General Public +License. + + + +"The Library" refers to a covered work governed by this License, other than +an Application or a Combined Work as defined below. + + + +An "Application" is any work that makes use of an interface provided by the +Library, but which is not otherwise based on the Library. Defining a subclass +of a class defined by the Library is deemed a mode of using an interface provided +by the Library. + + + +A "Combined Work" is a work produced by combining or linking an Application +with the Library. The particular version of the Library with which the Combined +Work was made is also called the "Linked Version". + + + +The "Minimal Corresponding Source" for a Combined Work means the Corresponding +Source for the Combined Work, excluding any source code for portions of the +Combined Work that, considered in isolation, are based on the Application, +and not on the Linked Version. + + + +The "Corresponding Application Code" for a Combined Work means the object +code and/or source code for the Application, including any data and utility +programs needed for reproducing the Combined Work from the Application, but +excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License without +being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a facility +refers to a function or data to be supplied by an Application that uses the +facility (other than as an argument passed when the facility is invoked), +then you may convey a copy of the modified version: + +a) under this License, provided that you make a good faith effort to ensure +that, in the event an Application does not supply the function or data, the +facility still operates, and performs whatever part of its purpose remains +meaningful, or + +b) under the GNU GPL, with none of the additional permissions of this License +applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from a header +file that is part of the Library. You may convey such object code under terms +of your choice, provided that, if the incorporated material is not limited +to numerical parameters, data structure layouts and accessors, or small macros, +inline functions and templates (ten or fewer lines in length), you do both +of the following: + +a) Give prominent notice with each copy of the object code that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license document. + + 4. Combined Works. + +You may convey a Combined Work under terms of your choice that, taken together, +effectively do not restrict modification of the portions of the Library contained +in the Combined Work and reverse engineering for debugging such modifications, +if you also do each of the following: + +a) Give prominent notice with each copy of the Combined Work that the Library +is used in it and that the Library and its use are covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during execution, include +the copyright notice for the Library among these notices, as well as a reference +directing the user to the copies of the GNU GPL and this license document. + + d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this License, +and the Corresponding Application Code in a form suitable for, and under terms +that permit, the user to recombine or relink the Application with a modified +version of the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (a) uses at run time a copy of the Library +already present on the user's computer system, and (b) will operate properly +with a modified version of the Library that is interface-compatible with the +Linked Version. + +e) Provide Installation Information, but only if you would otherwise be required +to provide such information under section 6 of the GNU GPL, and only to the +extent that such information is necessary to install and execute a modified +version of the Combined Work produced by recombining or relinking the Application +with a modified version of the Linked Version. (If you use option 4d0, the +Installation Information must accompany the Minimal Corresponding Source and +Corresponding Application Code. If you use option 4d1, you must provide the +Installation Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + + 5. Combined Libraries. + +You may place library facilities that are a work based on the Library side +by side in a single library together with other library facilities that are +not Applications and are not covered by this License, and convey such a combined +library under terms of your choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based on the +Library, uncombined with any other library facilities, conveyed under the +terms of this License. + +b) Give prominent notice with the combined library that part of it is a work +based on the Library, and explaining where to find the accompanying uncombined +form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions of the +GNU Lesser General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to address +new problems or concerns. + +Each version is given a distinguishing version number. If the Library as you +received it specifies that a certain numbered version of the GNU Lesser General +Public License "or any later version" applies to it, you have the option of +following the terms and conditions either of that published version or of +any later version published by the Free Software Foundation. If the Library +as you received it does not specify a version number of the GNU Lesser General +Public License, you may choose any version of the GNU Lesser General Public +License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide whether +future versions of the GNU Lesser General Public License shall apply, that +proxy's public statement of acceptance of any version is permanent authorization +for you to choose that version for the Library. diff --git a/README.md b/README.md new file mode 100644 index 0000000..67d5ac9 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ensure_cockpit + From 3ba4bbfaef1c8145a17a74ae12bf77d5fdee544f Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 29 Nov 2020 23:06:29 -0600 Subject: [PATCH 02/32] Default Ansible role content --- .travis.yml | 29 ++++++++++++++++++++++++++ README.md | 38 ++++++++++++++++++++++++++++++++- defaults/main.yml | 2 ++ handlers/main.yml | 2 ++ meta/main.yml | 53 +++++++++++++++++++++++++++++++++++++++++++++++ tasks/main.yml | 2 ++ tests/inventory | 2 ++ tests/test.yml | 5 +++++ vars/main.yml | 2 ++ 9 files changed, 134 insertions(+), 1 deletion(-) 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/main.yml 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 67d5ac9..225dd44 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,38 @@ -# ensure_cockpit +Role Name +========= +A brief description of the role goes here. + +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 +------- + +BSD + +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..1474d40 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for ensure_cockpit \ No newline at end of file diff --git a/handlers/main.yml b/handlers/main.yml new file mode 100644 index 0000000..f0b8e3c --- /dev/null +++ b/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ensure_cockpit \ No newline at end of file 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..8829754 --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,2 @@ +--- +# tasks file for ensure_cockpit \ No newline at end of file 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..e1897fe --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - ensure_cockpit \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..3db30dc --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_cockpit \ No newline at end of file From f48ff23d7c702d8d4bc37f205ee34600cfe87521 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 29 Nov 2020 23:21:17 -0600 Subject: [PATCH 03/32] Enable cockpit, initially Fedora 33 with others later --- README.md | 4 +-- meta/main.yml | 8 +++--- tasks/main.yml | 61 +++++++++++++++++++++++++++++++++++++++++++++- vars/Fedora-33.yml | 32 ++++++++++++++++++++++++ vars/default.yml | 2 ++ 5 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 vars/Fedora-33.yml create mode 100644 vars/default.yml diff --git a/README.md b/README.md index 225dd44..6f3c6e8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Role Name ========= -A brief description of the role goes here. +Ensures cockpit is running Requirements ------------ @@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe License ------- -BSD +LGPL-3.0-or-later Author Information ------------------ diff --git a/meta/main.yml b/meta/main.yml index 227ad9c..931f95d 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: Ensures cockpit is installed, running, and functional 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 @@ -50,4 +50,4 @@ galaxy_info: 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 index 8829754..f8019a5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,2 +1,61 @@ --- -# tasks file for ensure_cockpit \ No newline at end of file +# tasks file for ensure_cockpit +- name: 'include variables' + when: + - ansible_system == 'Linux' + include_vars: + file: '{{ lookup("first_found", findme ) }}' + name: 'ensure_cockpit' + 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 + ansible.builtin.package_facts: +- name: 'ensure packages' + when: + - ansible_system == 'Linux' + - ensure_cockpit is defined + - ensure_cockpit.package_list is defined + - ensure_cockpit.package_list is iterable + - packages[item.name] is not defined + ansible.builtin.package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_cockpit.package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_cockpit.package_facts' + - 'ensure_cockpit.service_facts' +- name: 'ensure services' + when: + - ansible_system == 'Linux' + - ensure_cockpit is defined + - ensure_cockpit.service_list is defined + - ensure_cockpit.service_list is iterable + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_cockpit.service_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_cockpit.package_facts' + - 'ensure_cockpit.service_facts' +- name: 'flush handlers' + meta: 'flush_handlers' + diff --git a/vars/Fedora-33.yml b/vars/Fedora-33.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/Fedora-33.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/default.yml b/vars/default.yml new file mode 100644 index 0000000..3db30dc --- /dev/null +++ b/vars/default.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_cockpit \ No newline at end of file From 554ae1704d9fe4e5efd51b07ebf51cfbe74c1f9f Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 20 Dec 2020 07:39:46 -0600 Subject: [PATCH 04/32] 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 f8019a5..9e62a55 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' + - packages is not defined + ansible.builtin.service_facts: - name: 'ensure packages' when: - ansible_system == 'Linux' From af0c090ac8ca45f390a88cf769db394c6e81aa0a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 20 Dec 2020 07:41:33 -0600 Subject: [PATCH 05/32] Do service discovery as well as package discovery --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 9e62a55..39b8b00 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -27,7 +27,7 @@ - name: 'service discovery' when: - ansible_system == 'Linux' - - packages is not defined + - services is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: From 75741f8dddb84dde5e1ae38546dda79c20820552 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 20 Dec 2020 14:52:18 -0600 Subject: [PATCH 06/32] Add CentOS 7+ and Fedora 30+ support --- vars/CentOS-7.yml | 32 ++++++++++++++++++++++++++++++++ vars/CentOS-8.yml | 32 ++++++++++++++++++++++++++++++++ vars/Fedora-30.yml | 32 ++++++++++++++++++++++++++++++++ vars/Fedora-31.yml | 32 ++++++++++++++++++++++++++++++++ vars/Fedora-32.yml | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+) create mode 100644 vars/CentOS-7.yml create mode 100644 vars/CentOS-8.yml create mode 100644 vars/Fedora-30.yml create mode 100644 vars/Fedora-31.yml create mode 100644 vars/Fedora-32.yml diff --git a/vars/CentOS-7.yml b/vars/CentOS-7.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/CentOS-7.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/CentOS-8.yml b/vars/CentOS-8.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/CentOS-8.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-30.yml b/vars/Fedora-30.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/Fedora-30.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-31.yml b/vars/Fedora-31.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/Fedora-31.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-32.yml b/vars/Fedora-32.yml new file mode 100644 index 0000000..580f590 --- /dev/null +++ b/vars/Fedora-32.yml @@ -0,0 +1,32 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + From 609faa35223bf7f7f7137d7f3d3354b25b2dd615 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 20 Dec 2020 15:17:54 -0600 Subject: [PATCH 07/32] Now adding Fedora 21+ support --- vars/Fedora-21.yml | 12 ++++++++++++ vars/Fedora-22.yml | 18 ++++++++++++++++++ vars/Fedora-23.yml | 22 ++++++++++++++++++++++ vars/Fedora-24.yml | 26 ++++++++++++++++++++++++++ vars/Fedora-25.yml | 34 ++++++++++++++++++++++++++++++++++ vars/Fedora-26.yml | 34 ++++++++++++++++++++++++++++++++++ vars/Fedora-27.yml | 34 ++++++++++++++++++++++++++++++++++ vars/Fedora-28.yml | 34 ++++++++++++++++++++++++++++++++++ vars/Fedora-29.yml | 34 ++++++++++++++++++++++++++++++++++ vars/Fedora-30.yml | 2 ++ vars/Fedora-31.yml | 2 ++ vars/Fedora-32.yml | 2 ++ vars/Fedora-33.yml | 2 ++ 13 files changed, 256 insertions(+) create mode 100644 vars/Fedora-21.yml create mode 100644 vars/Fedora-22.yml create mode 100644 vars/Fedora-23.yml create mode 100644 vars/Fedora-24.yml create mode 100644 vars/Fedora-25.yml create mode 100644 vars/Fedora-26.yml create mode 100644 vars/Fedora-27.yml create mode 100644 vars/Fedora-28.yml create mode 100644 vars/Fedora-29.yml diff --git a/vars/Fedora-21.yml b/vars/Fedora-21.yml new file mode 100644 index 0000000..e6a7a7b --- /dev/null +++ b/vars/Fedora-21.yml @@ -0,0 +1,12 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-doc' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-22.yml b/vars/Fedora-22.yml new file mode 100644 index 0000000..6d4f489 --- /dev/null +++ b/vars/Fedora-22.yml @@ -0,0 +1,18 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-23.yml b/vars/Fedora-23.yml new file mode 100644 index 0000000..76aaab6 --- /dev/null +++ b/vars/Fedora-23.yml @@ -0,0 +1,22 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-24.yml b/vars/Fedora-24.yml new file mode 100644 index 0000000..982ed1d --- /dev/null +++ b/vars/Fedora-24.yml @@ -0,0 +1,26 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-25.yml b/vars/Fedora-25.yml new file mode 100644 index 0000000..c6ff8ed --- /dev/null +++ b/vars/Fedora-25.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-26.yml b/vars/Fedora-26.yml new file mode 100644 index 0000000..c6ff8ed --- /dev/null +++ b/vars/Fedora-26.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-27.yml b/vars/Fedora-27.yml new file mode 100644 index 0000000..c6ff8ed --- /dev/null +++ b/vars/Fedora-27.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-28.yml b/vars/Fedora-28.yml new file mode 100644 index 0000000..c6ff8ed --- /dev/null +++ b/vars/Fedora-28.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-29.yml b/vars/Fedora-29.yml new file mode 100644 index 0000000..c6ff8ed --- /dev/null +++ b/vars/Fedora-29.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + diff --git a/vars/Fedora-30.yml b/vars/Fedora-30.yml index 580f590..c6ff8ed 100644 --- a/vars/Fedora-30.yml +++ b/vars/Fedora-30.yml @@ -19,6 +19,8 @@ package_list: state: 'present' - name: 'cockpit-selinux' state: 'present' + - name: 'cockpit-sosreport' + state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' diff --git a/vars/Fedora-31.yml b/vars/Fedora-31.yml index 580f590..c6ff8ed 100644 --- a/vars/Fedora-31.yml +++ b/vars/Fedora-31.yml @@ -19,6 +19,8 @@ package_list: state: 'present' - name: 'cockpit-selinux' state: 'present' + - name: 'cockpit-sosreport' + state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' diff --git a/vars/Fedora-32.yml b/vars/Fedora-32.yml index 580f590..c6ff8ed 100644 --- a/vars/Fedora-32.yml +++ b/vars/Fedora-32.yml @@ -19,6 +19,8 @@ package_list: state: 'present' - name: 'cockpit-selinux' state: 'present' + - name: 'cockpit-sosreport' + state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' diff --git a/vars/Fedora-33.yml b/vars/Fedora-33.yml index 580f590..c6ff8ed 100644 --- a/vars/Fedora-33.yml +++ b/vars/Fedora-33.yml @@ -19,6 +19,8 @@ package_list: state: 'present' - name: 'cockpit-selinux' state: 'present' + - name: 'cockpit-sosreport' + state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' From 0f010e2ed7f96bf81f47aee0de978519d1924be0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 8 Feb 2021 21:25:07 -0600 Subject: [PATCH 08/32] Use correct variable names --- vars/{CentOS-7.yml => CentOS-7-default.yml} | 0 vars/{CentOS-8.yml => CentOS-8-default.yml} | 0 vars/{Fedora-21.yml => Fedora-21-default.yml} | 0 vars/{Fedora-22.yml => Fedora-22-default.yml} | 0 vars/{Fedora-23.yml => Fedora-23-default.yml} | 0 vars/{Fedora-24.yml => Fedora-24-default.yml} | 0 vars/{Fedora-25.yml => Fedora-25-default.yml} | 0 vars/{Fedora-26.yml => Fedora-26-default.yml} | 0 vars/{Fedora-27.yml => Fedora-27-default.yml} | 0 vars/{Fedora-28.yml => Fedora-28-default.yml} | 0 vars/{Fedora-29.yml => Fedora-29-default.yml} | 0 vars/{Fedora-30.yml => Fedora-30-default.yml} | 0 vars/{Fedora-31.yml => Fedora-31-default.yml} | 0 vars/{Fedora-32.yml => Fedora-32-default.yml} | 0 vars/{Fedora-33.yml => Fedora-33-default.yml} | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename vars/{CentOS-7.yml => CentOS-7-default.yml} (100%) rename vars/{CentOS-8.yml => CentOS-8-default.yml} (100%) rename vars/{Fedora-21.yml => Fedora-21-default.yml} (100%) rename vars/{Fedora-22.yml => Fedora-22-default.yml} (100%) rename vars/{Fedora-23.yml => Fedora-23-default.yml} (100%) rename vars/{Fedora-24.yml => Fedora-24-default.yml} (100%) rename vars/{Fedora-25.yml => Fedora-25-default.yml} (100%) rename vars/{Fedora-26.yml => Fedora-26-default.yml} (100%) rename vars/{Fedora-27.yml => Fedora-27-default.yml} (100%) rename vars/{Fedora-28.yml => Fedora-28-default.yml} (100%) rename vars/{Fedora-29.yml => Fedora-29-default.yml} (100%) rename vars/{Fedora-30.yml => Fedora-30-default.yml} (100%) rename vars/{Fedora-31.yml => Fedora-31-default.yml} (100%) rename vars/{Fedora-32.yml => Fedora-32-default.yml} (100%) rename vars/{Fedora-33.yml => Fedora-33-default.yml} (100%) diff --git a/vars/CentOS-7.yml b/vars/CentOS-7-default.yml similarity index 100% rename from vars/CentOS-7.yml rename to vars/CentOS-7-default.yml diff --git a/vars/CentOS-8.yml b/vars/CentOS-8-default.yml similarity index 100% rename from vars/CentOS-8.yml rename to vars/CentOS-8-default.yml diff --git a/vars/Fedora-21.yml b/vars/Fedora-21-default.yml similarity index 100% rename from vars/Fedora-21.yml rename to vars/Fedora-21-default.yml diff --git a/vars/Fedora-22.yml b/vars/Fedora-22-default.yml similarity index 100% rename from vars/Fedora-22.yml rename to vars/Fedora-22-default.yml diff --git a/vars/Fedora-23.yml b/vars/Fedora-23-default.yml similarity index 100% rename from vars/Fedora-23.yml rename to vars/Fedora-23-default.yml diff --git a/vars/Fedora-24.yml b/vars/Fedora-24-default.yml similarity index 100% rename from vars/Fedora-24.yml rename to vars/Fedora-24-default.yml diff --git a/vars/Fedora-25.yml b/vars/Fedora-25-default.yml similarity index 100% rename from vars/Fedora-25.yml rename to vars/Fedora-25-default.yml diff --git a/vars/Fedora-26.yml b/vars/Fedora-26-default.yml similarity index 100% rename from vars/Fedora-26.yml rename to vars/Fedora-26-default.yml diff --git a/vars/Fedora-27.yml b/vars/Fedora-27-default.yml similarity index 100% rename from vars/Fedora-27.yml rename to vars/Fedora-27-default.yml diff --git a/vars/Fedora-28.yml b/vars/Fedora-28-default.yml similarity index 100% rename from vars/Fedora-28.yml rename to vars/Fedora-28-default.yml diff --git a/vars/Fedora-29.yml b/vars/Fedora-29-default.yml similarity index 100% rename from vars/Fedora-29.yml rename to vars/Fedora-29-default.yml diff --git a/vars/Fedora-30.yml b/vars/Fedora-30-default.yml similarity index 100% rename from vars/Fedora-30.yml rename to vars/Fedora-30-default.yml diff --git a/vars/Fedora-31.yml b/vars/Fedora-31-default.yml similarity index 100% rename from vars/Fedora-31.yml rename to vars/Fedora-31-default.yml diff --git a/vars/Fedora-32.yml b/vars/Fedora-32-default.yml similarity index 100% rename from vars/Fedora-32.yml rename to vars/Fedora-32-default.yml diff --git a/vars/Fedora-33.yml b/vars/Fedora-33-default.yml similarity index 100% rename from vars/Fedora-33.yml rename to vars/Fedora-33-default.yml From bbaffc70a17b16c3b0cb233a88fd364286d352c7 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 8 Feb 2021 21:31:27 -0600 Subject: [PATCH 09/32] Add missing handlers --- handlers/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index f0b8e3c..ca700cb 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,6 @@ --- -# handlers file for ensure_cockpit \ No newline at end of file +# handlers file for ensure_cockpit +- name: 'ensure_cockpit.package_facts' + ansible.builtin.package_facts: +- name: 'ensure_cockpit.service_facts' + ansible.builtin.service_facts: From 7f74c59efeb4304e3e5ad668aa8a916e56b0b1c8 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 20 Feb 2021 20:29:26 -0600 Subject: [PATCH 10/32] CentOS 8 Stream didn't Obsolete cockpit-dashboard correctly --- vars/CentOS-8-default.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index 580f590..aea8e67 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -5,8 +5,6 @@ package_list: state: 'present' - name: 'cockpit-bridge' state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - name: 'cockpit-doc' state: 'present' - name: 'cockpit-kdump' From 34a8e0de0ee537e22171eb05389070dd096c84a8 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 29 Jun 2021 22:23:28 -0500 Subject: [PATCH 11/32] Enable Fedora 34 --- vars/Fedora-34-default.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 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..c6ff8ed --- /dev/null +++ b/vars/Fedora-34-default.yml @@ -0,0 +1,34 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-dashboard' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' + From b472a7d0dc9438cebb5daf42a444fdd4446de234 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 29 Jun 2021 22:30:53 -0500 Subject: [PATCH 12/32] Remove cockpit-dashboard as it was rolled into cockpit --- vars/Fedora-34-default.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml index c6ff8ed..adaec57 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/Fedora-34-default.yml @@ -5,8 +5,6 @@ package_list: state: 'present' - name: 'cockpit-bridge' state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - name: 'cockpit-doc' state: 'present' - name: 'cockpit-kdump' From 7bf3af92fd04bba451313912b2726a147cf677a3 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Wed, 21 Jul 2021 02:39:29 +0000 Subject: [PATCH 13/32] Update task template to deploy config files if needed --- tasks/main.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index 39b8b00..70bdf22 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,6 +45,31 @@ notify: - 'ensure_cockpit.package_facts' - 'ensure_cockpit.service_facts' +- name: 'ensure configurations' + when: + - ansible_system == 'Linux' + - ensure_cockpit is defined + - ensure_cockpit.template_list is defined + - ensure_cockpit.template_list is iterable + ansible.builtin.template: + backup: 'no' + dest: '{{ item.dest }}' + group: '{{ item.group | default(omit) }}' + mode: '{{ item.mode | default(omit) }}' + owner: '{{ item.owner | default(omit) }}' + selevel: '{{ iteml.selevel | default(omit) }}' + serole: '{{ item.serole | default(omit) }}' + setype: '{{ item.setype | default(omit) }}' + seuser: '{{ item.seuser | default(omit) }}' + src: '{{ item.src }}' + loop: '{{ ensure_cockpit.template_list }}' + loop_control: + label: '{{ item.dest }} will be ensured' + notify: + - 'ensure_cockpit.package_facts' + - 'ensure_cockpit.service_facts' +- name: 'flush handlers' + meta: 'flush_handlers' - name: 'ensure services' when: - ansible_system == 'Linux' From 3ae1aab3a8fe14b17c3ab451f02d90582fb1ddc1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 Jul 2021 03:49:00 +0000 Subject: [PATCH 14/32] Prevent multiple service restarts --- tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 70bdf22..2c71a19 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -68,8 +68,6 @@ notify: - 'ensure_cockpit.package_facts' - 'ensure_cockpit.service_facts' -- name: 'flush handlers' - meta: 'flush_handlers' - name: 'ensure services' when: - ansible_system == 'Linux' From 2e6dcbbcbe075c6056b238c8def59dfc913dc03a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 7 Nov 2021 23:02:25 -0600 Subject: [PATCH 15/32] Enable Fedora 35 --- vars/CentOS-7-default.yml | 1 - vars/CentOS-8-default.yml | 1 - vars/Fedora-21-default.yml | 1 - vars/Fedora-22-default.yml | 1 - vars/Fedora-23-default.yml | 1 - vars/Fedora-24-default.yml | 1 - vars/Fedora-25-default.yml | 1 - vars/Fedora-26-default.yml | 1 - vars/Fedora-27-default.yml | 1 - vars/Fedora-28-default.yml | 1 - vars/Fedora-29-default.yml | 1 - vars/Fedora-30-default.yml | 1 - vars/Fedora-31-default.yml | 1 - vars/Fedora-32-default.yml | 1 - vars/Fedora-33-default.yml | 1 - vars/Fedora-34-default.yml | 1 - vars/Fedora-35-default.yml | 31 +++++++++++++++++++++++++++++++ 17 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 vars/Fedora-35-default.yml diff --git a/vars/CentOS-7-default.yml b/vars/CentOS-7-default.yml index 580f590..c368b67 100644 --- a/vars/CentOS-7-default.yml +++ b/vars/CentOS-7-default.yml @@ -29,4 +29,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index aea8e67..ecd8a3c 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -27,4 +27,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-21-default.yml b/vars/Fedora-21-default.yml index e6a7a7b..f9da82f 100644 --- a/vars/Fedora-21-default.yml +++ b/vars/Fedora-21-default.yml @@ -9,4 +9,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-22-default.yml b/vars/Fedora-22-default.yml index 6d4f489..112f649 100644 --- a/vars/Fedora-22-default.yml +++ b/vars/Fedora-22-default.yml @@ -15,4 +15,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-23-default.yml b/vars/Fedora-23-default.yml index 76aaab6..17c45b7 100644 --- a/vars/Fedora-23-default.yml +++ b/vars/Fedora-23-default.yml @@ -19,4 +19,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-24-default.yml b/vars/Fedora-24-default.yml index 982ed1d..02ae0c0 100644 --- a/vars/Fedora-24-default.yml +++ b/vars/Fedora-24-default.yml @@ -23,4 +23,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-25-default.yml +++ b/vars/Fedora-25-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-26-default.yml +++ b/vars/Fedora-26-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-27-default.yml +++ b/vars/Fedora-27-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-28-default.yml +++ b/vars/Fedora-28-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-29-default.yml +++ b/vars/Fedora-29-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-30-default.yml +++ b/vars/Fedora-30-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-31-default.yml +++ b/vars/Fedora-31-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-32-default.yml +++ b/vars/Fedora-32-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml index c6ff8ed..53cc5df 100644 --- a/vars/Fedora-33-default.yml +++ b/vars/Fedora-33-default.yml @@ -31,4 +31,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml index adaec57..eb7db14 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/Fedora-34-default.yml @@ -29,4 +29,3 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' - diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml new file mode 100644 index 0000000..eb7db14 --- /dev/null +++ b/vars/Fedora-35-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From e1c182a208ab9b3805807c6c8a3cab7ba262e359 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 12:21:47 -0500 Subject: [PATCH 16/32] Add Fedora 36 --- vars/Fedora-36-default.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 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..eb7db14 --- /dev/null +++ b/vars/Fedora-36-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From d47eebe94865abf8bde2a31921266fd8e2325387 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:29:17 -0500 Subject: [PATCH 17/32] Update handlers --- handlers/main.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/handlers/main.yml b/handlers/main.yml index ca700cb..0f965fa 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,3 +4,24 @@ ansible.builtin.package_facts: - name: 'ensure_cockpit.service_facts' ansible.builtin.service_facts: +- name: 'ensure_cockpit.service_reload' + when: + - ansible_system == 'Linux' + - ansible_service_mgr == 'systemd' + - ensure_cockpit is defined + ansible.builtin.systemd: + daemon_reload: 'yes' +- name: 'ensure_cockpit.services' + when: + - ansible_system == 'Linux' + - ensure_cockpit is defined + - ensure_cockpit.service_list is defined + - ensure_cockpit.service_list is iterable + - item.state == 'started' + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: 'restarted' + loop: '{{ ensure_cockpit.service_list }}' + loop_control: + label: '{{ item.name }} will be restarted' From 0037732484edd6fb43a251a8cdb6827f9d5196fd Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:47:34 -0500 Subject: [PATCH 18/32] Update tasks --- tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 2c71a19..629044a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,7 +35,6 @@ - ensure_cockpit is defined - ensure_cockpit.package_list is defined - ensure_cockpit.package_list is iterable - - packages[item.name] is not defined ansible.builtin.package: name: '{{ item.name }}' state: '{{ item.state }}' From d5534da21b16c2b894673a94595b5cf703cd717b Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 6 Dec 2022 20:43:04 -0600 Subject: [PATCH 19/32] Add Fedora 37 --- vars/Fedora-37-default.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 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..eb7db14 --- /dev/null +++ b/vars/Fedora-37-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From aec8d9c202fdbe4f2582a492655bf88e1c200a06 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 30 Apr 2023 17:41:23 -0500 Subject: [PATCH 20/32] Add Fedora 38 and CentOS 9 --- vars/CentOS-9-default.yml | 29 +++++++++++++++++++++++++++++ vars/Fedora-38-default.yml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 vars/CentOS-9-default.yml create mode 100644 vars/Fedora-38-default.yml diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/CentOS-9-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml new file mode 100644 index 0000000..eb7db14 --- /dev/null +++ b/vars/Fedora-38-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From b4a49a2f036f5d2e1f0da5344df91e6c9aca9a5f Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 16 Mar 2024 20:18:57 -0500 Subject: [PATCH 21/32] Add Fedora 39 --- vars/Fedora-39-default.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 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..eb7db14 --- /dev/null +++ b/vars/Fedora-39-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From d275f5138a18c7be0bb7966ef83677e8e63f8b12 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 2 Jun 2024 12:12:58 -0500 Subject: [PATCH 22/32] Fedora 40 support Signed-off-by: Jason Rothstein --- vars/Fedora-40-default.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 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..eb7db14 --- /dev/null +++ b/vars/Fedora-40-default.yml @@ -0,0 +1,31 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From fb1398594e71371be03ce43e13eed59d43eccbf0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 30 Jun 2024 13:41:28 -0500 Subject: [PATCH 23/32] Add Alma/Oracle/Rocky 8 and 9 Signed-off-by: Jason Rothstein --- vars/AlmaLinux-8-default.yml | 29 +++++++++++++++++++++++++++++ vars/AlmaLinux-9-default.yml | 29 +++++++++++++++++++++++++++++ vars/OracleLinux-8-default.yml | 29 +++++++++++++++++++++++++++++ vars/OracleLinux-9-default.yml | 29 +++++++++++++++++++++++++++++ vars/Rocky-8-default.yml | 29 +++++++++++++++++++++++++++++ vars/Rocky-9-default.yml | 29 +++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+) create mode 100644 vars/AlmaLinux-8-default.yml create mode 100644 vars/AlmaLinux-9-default.yml create mode 100644 vars/OracleLinux-8-default.yml create mode 100644 vars/OracleLinux-9-default.yml create mode 100644 vars/Rocky-8-default.yml create mode 100644 vars/Rocky-9-default.yml diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/AlmaLinux-8-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/AlmaLinux-9-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/OracleLinux-8-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..ecd8a3c --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-pcp' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From 2dc8e98c9ece4c65ce0a48a4932c23cfe3266aff Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Fri, 27 Dec 2024 16:14:36 -0600 Subject: [PATCH 24/32] Fedora 41 Signed-off-by: Jason Rothstein --- vars/Fedora-41-default.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 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..490dcf7 --- /dev/null +++ b/vars/Fedora-41-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From 9ffeb0463d25945312af3744fe32e22c75dc4f6f Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 27 Apr 2025 12:22:36 -0500 Subject: [PATCH 25/32] Fedora 42 Signed-off-by: Jason Rothstein --- vars/Fedora-42-default.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 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..490dcf7 --- /dev/null +++ b/vars/Fedora-42-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From c4fc44a7e45e6e323d219bf9eee2cafec5debe18 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 May 2025 20:05:26 -0500 Subject: [PATCH 26/32] Handler improvements Signed-off-by: Jason Rothstein --- handlers/main.yml | 4 +++- tasks/main.yml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 0f965fa..564bb34 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -11,7 +11,7 @@ - ensure_cockpit is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_cockpit.services' +- name: 'ensure_cockpit.service_restart' when: - ansible_system == 'Linux' - ensure_cockpit is defined @@ -25,3 +25,5 @@ loop: '{{ ensure_cockpit.service_list }}' loop_control: label: '{{ item.name }} will be restarted' +... + diff --git a/tasks/main.yml b/tasks/main.yml index 629044a..8dbecf3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -67,6 +67,8 @@ notify: - 'ensure_cockpit.package_facts' - 'ensure_cockpit.service_facts' + - 'ensure_cockpit.service_reload' + - 'ensure_cockpit.service_restart' - name: 'ensure services' when: - ansible_system == 'Linux' @@ -85,4 +87,5 @@ - 'ensure_cockpit.service_facts' - name: 'flush handlers' meta: 'flush_handlers' +... From 533346928c12c9e16b89d0ee09a8e0d3db05b0bb Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 9 Mar 2026 00:57:40 -0500 Subject: [PATCH 27/32] Fixed EL9, Added EL10 and Fedora43 --- vars/AlmaLinux-10-default.yml | 24 ++++++++++++++++++++++++ vars/AlmaLinux-9-default.yml | 11 +++-------- vars/CentOS-10-default.yml | 24 ++++++++++++++++++++++++ vars/CentOS-9-default.yml | 11 +++-------- vars/Fedora-43-default.yml | 29 +++++++++++++++++++++++++++++ vars/OracleLinux-10-default.yml | 24 ++++++++++++++++++++++++ vars/OracleLinux-9-default.yml | 11 +++-------- vars/Rocky-10-default.yml | 24 ++++++++++++++++++++++++ vars/Rocky-9-default.yml | 11 +++-------- 9 files changed, 137 insertions(+), 32 deletions(-) create mode 100644 vars/AlmaLinux-10-default.yml create mode 100644 vars/CentOS-10-default.yml create mode 100644 vars/Fedora-43-default.yml create mode 100644 vars/OracleLinux-10-default.yml create mode 100644 vars/Rocky-10-default.yml diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml new file mode 100644 index 0000000..3e30e32 --- /dev/null +++ b/vars/AlmaLinux-10-default.yml @@ -0,0 +1,24 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml index ecd8a3c..3e30e32 100644 --- a/vars/AlmaLinux-9-default.yml +++ b/vars/AlmaLinux-9-default.yml @@ -7,23 +7,18 @@ package_list: state: 'present' - name: 'cockpit-doc' state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - name: 'cockpit-packagekit' state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' state: 'present' - name: 'cockpit-ws' state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml new file mode 100644 index 0000000..3e30e32 --- /dev/null +++ b/vars/CentOS-10-default.yml @@ -0,0 +1,24 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml index ecd8a3c..3e30e32 100644 --- a/vars/CentOS-9-default.yml +++ b/vars/CentOS-9-default.yml @@ -7,23 +7,18 @@ package_list: state: 'present' - name: 'cockpit-doc' state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - name: 'cockpit-packagekit' state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' state: 'present' - name: 'cockpit-ws' state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml new file mode 100644 index 0000000..490dcf7 --- /dev/null +++ b/vars/Fedora-43-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml new file mode 100644 index 0000000..3e30e32 --- /dev/null +++ b/vars/OracleLinux-10-default.yml @@ -0,0 +1,24 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml index ecd8a3c..3e30e32 100644 --- a/vars/OracleLinux-9-default.yml +++ b/vars/OracleLinux-9-default.yml @@ -7,23 +7,18 @@ package_list: state: 'present' - name: 'cockpit-doc' state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - name: 'cockpit-packagekit' state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' state: 'present' - name: 'cockpit-ws' state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..3e30e32 --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,24 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml index ecd8a3c..3e30e32 100644 --- a/vars/Rocky-9-default.yml +++ b/vars/Rocky-9-default.yml @@ -7,23 +7,18 @@ package_list: state: 'present' - name: 'cockpit-doc' state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - name: 'cockpit-packagekit' state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - name: 'cockpit-storaged' state: 'present' - name: 'cockpit-system' state: 'present' - name: 'cockpit-ws' state: 'present' + - name: 'cockpit-ws-selinux' + state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... From e85403df7f516c65f8bf2f419a44cf4791cd75f7 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Wed, 29 Apr 2026 23:39:19 -0500 Subject: [PATCH 28/32] Fedora 44 --- vars/Fedora-44-default.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 vars/Fedora-44-default.yml diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml new file mode 100644 index 0000000..490dcf7 --- /dev/null +++ b/vars/Fedora-44-default.yml @@ -0,0 +1,29 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-kdump' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-selinux' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' From db7d610d552eac71174caede3c5a42ec2773c9e7 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 21:46:55 -0500 Subject: [PATCH 29/32] Ansible core 2.20 fixes plus only supported os versions Signed-off-by: Jason Rothstein --- tasks/main.yml | 24 +++++++------- vars/AlmaLinux-10-default.yml | 1 + vars/AlmaLinux-8-default.yml | 2 ++ vars/AlmaLinux-9-default.yml | 1 + vars/CentOS-10-default.yml | 1 + vars/CentOS-7-default.yml | 31 ----------------- vars/CentOS-8-default.yml | 2 ++ vars/CentOS-9-default.yml | 1 + ...a-23-default.yml => Debian-11-default.yml} | 6 +++- ...a-24-default.yml => Debian-12-default.yml} | 8 +++-- ...a-41-default.yml => Debian-13-default.yml} | 6 ++-- vars/Fedora-21-default.yml | 11 ------- vars/Fedora-22-default.yml | 17 ---------- vars/Fedora-25-default.yml | 33 ------------------- vars/Fedora-26-default.yml | 33 ------------------- vars/Fedora-27-default.yml | 33 ------------------- vars/Fedora-28-default.yml | 33 ------------------- vars/Fedora-29-default.yml | 33 ------------------- vars/Fedora-30-default.yml | 33 ------------------- vars/Fedora-31-default.yml | 33 ------------------- vars/Fedora-32-default.yml | 33 ------------------- vars/Fedora-33-default.yml | 33 ------------------- vars/Fedora-34-default.yml | 31 ----------------- vars/Fedora-35-default.yml | 31 ----------------- vars/Fedora-36-default.yml | 31 ----------------- vars/Fedora-37-default.yml | 31 ----------------- vars/Fedora-38-default.yml | 31 ----------------- vars/Fedora-39-default.yml | 31 ----------------- vars/Fedora-40-default.yml | 31 ----------------- vars/Fedora-42-default.yml | 2 ++ vars/Fedora-43-default.yml | 2 ++ vars/Fedora-44-default.yml | 2 ++ vars/OracleLinux-10-default.yml | 1 + vars/OracleLinux-8-default.yml | 2 ++ vars/OracleLinux-9-default.yml | 1 + vars/Rocky-10-default.yml | 1 + vars/Rocky-8-default.yml | 2 ++ vars/Rocky-9-default.yml | 1 + 38 files changed, 46 insertions(+), 593 deletions(-) delete mode 100644 vars/CentOS-7-default.yml rename vars/{Fedora-23-default.yml => Debian-11-default.yml} (83%) rename vars/{Fedora-24-default.yml => Debian-12-default.yml} (88%) rename vars/{Fedora-41-default.yml => Debian-13-default.yml} (85%) delete mode 100644 vars/Fedora-21-default.yml delete mode 100644 vars/Fedora-22-default.yml delete mode 100644 vars/Fedora-25-default.yml delete mode 100644 vars/Fedora-26-default.yml delete mode 100644 vars/Fedora-27-default.yml delete mode 100644 vars/Fedora-28-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 diff --git a/tasks/main.yml b/tasks/main.yml index 8dbecf3..b27fee2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,36 +2,36 @@ # tasks file for ensure_cockpit - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_cockpit' 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' + - '{{ 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_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/' errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - 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_cockpit is defined - ensure_cockpit.package_list is defined - ensure_cockpit.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_cockpit.service_facts' - name: 'ensure configurations' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined - ensure_cockpit.template_list is defined - ensure_cockpit.template_list is iterable @@ -71,7 +71,7 @@ - 'ensure_cockpit.service_restart' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined - ensure_cockpit.service_list is defined - ensure_cockpit.service_list is iterable diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml index 3e30e32..12890bf 100644 --- a/vars/AlmaLinux-10-default.yml +++ b/vars/AlmaLinux-10-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml index ecd8a3c..9ecdf32 100644 --- a/vars/AlmaLinux-8-default.yml +++ b/vars/AlmaLinux-8-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml index 3e30e32..12890bf 100644 --- a/vars/AlmaLinux-9-default.yml +++ b/vars/AlmaLinux-9-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml index 3e30e32..12890bf 100644 --- a/vars/CentOS-10-default.yml +++ b/vars/CentOS-10-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/CentOS-7-default.yml b/vars/CentOS-7-default.yml deleted file mode 100644 index c368b67..0000000 --- a/vars/CentOS-7-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml index ecd8a3c..9ecdf32 100644 --- a/vars/CentOS-8-default.yml +++ b/vars/CentOS-8-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml index 3e30e32..12890bf 100644 --- a/vars/CentOS-9-default.yml +++ b/vars/CentOS-9-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/Fedora-23-default.yml b/vars/Debian-11-default.yml similarity index 83% rename from vars/Fedora-23-default.yml rename to vars/Debian-11-default.yml index 17c45b7..17fb50c 100644 --- a/vars/Fedora-23-default.yml +++ b/vars/Debian-11-default.yml @@ -9,13 +9,17 @@ package_list: state: 'present' - name: 'cockpit-networkmanager' state: 'present' - - name: 'cockpit-pcp' + - name: 'cockpit-packagekit' state: 'present' - name: 'cockpit-storaged' state: 'present' + - name: 'cockpit-system' + state: 'present' - name: 'cockpit-ws' state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Fedora-24-default.yml b/vars/Debian-12-default.yml similarity index 88% rename from vars/Fedora-24-default.yml rename to vars/Debian-12-default.yml index 02ae0c0..57e7336 100644 --- a/vars/Fedora-24-default.yml +++ b/vars/Debian-12-default.yml @@ -9,17 +9,19 @@ package_list: state: 'present' - name: 'cockpit-networkmanager' state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' + - name: 'cockpit-packagekit' state: 'present' - name: 'cockpit-sosreport' state: 'present' - name: 'cockpit-storaged' state: 'present' + - name: 'cockpit-system' + state: 'present' - name: 'cockpit-ws' state: 'present' service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Fedora-41-default.yml b/vars/Debian-13-default.yml similarity index 85% rename from vars/Fedora-41-default.yml rename to vars/Debian-13-default.yml index 490dcf7..57e7336 100644 --- a/vars/Fedora-41-default.yml +++ b/vars/Debian-13-default.yml @@ -7,14 +7,10 @@ package_list: state: 'present' - name: 'cockpit-doc' state: 'present' - - name: 'cockpit-kdump' - state: 'present' - name: 'cockpit-networkmanager' state: 'present' - name: 'cockpit-packagekit' state: 'present' - - name: 'cockpit-selinux' - state: 'present' - name: 'cockpit-sosreport' state: 'present' - name: 'cockpit-storaged' @@ -27,3 +23,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Fedora-21-default.yml b/vars/Fedora-21-default.yml deleted file mode 100644 index f9da82f..0000000 --- a/vars/Fedora-21-default.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-doc' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-22-default.yml b/vars/Fedora-22-default.yml deleted file mode 100644 index 112f649..0000000 --- a/vars/Fedora-22-default.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-25-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-26-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-27-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-28-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-29-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-30-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-31-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-32-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml deleted file mode 100644 index 53cc5df..0000000 --- a/vars/Fedora-33-default.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-dashboard' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-34-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-35-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-36-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-37-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index eb7db14..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# vars file for ensure_cockpit -package_list: - - name: 'cockpit' - state: 'present' - - name: 'cockpit-bridge' - state: 'present' - - name: 'cockpit-doc' - state: 'present' - - name: 'cockpit-kdump' - state: 'present' - - name: 'cockpit-networkmanager' - state: 'present' - - name: 'cockpit-packagekit' - state: 'present' - - name: 'cockpit-pcp' - state: 'present' - - name: 'cockpit-selinux' - state: 'present' - - name: 'cockpit-sosreport' - state: 'present' - - name: 'cockpit-storaged' - state: 'present' - - name: 'cockpit-system' - state: 'present' - - name: 'cockpit-ws' - state: 'present' -service_list: - - name: 'cockpit.socket' - state: 'started' - enabled: 'yes' diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml index 490dcf7..48f272d 100644 --- a/vars/Fedora-42-default.yml +++ b/vars/Fedora-42-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml index 490dcf7..48f272d 100644 --- a/vars/Fedora-43-default.yml +++ b/vars/Fedora-43-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml index 490dcf7..48f272d 100644 --- a/vars/Fedora-44-default.yml +++ b/vars/Fedora-44-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml index 3e30e32..12890bf 100644 --- a/vars/OracleLinux-10-default.yml +++ b/vars/OracleLinux-10-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml index ecd8a3c..9ecdf32 100644 --- a/vars/OracleLinux-8-default.yml +++ b/vars/OracleLinux-8-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml index 3e30e32..12890bf 100644 --- a/vars/OracleLinux-9-default.yml +++ b/vars/OracleLinux-9-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml index 3e30e32..12890bf 100644 --- a/vars/Rocky-10-default.yml +++ b/vars/Rocky-10-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml index ecd8a3c..9ecdf32 100644 --- a/vars/Rocky-8-default.yml +++ b/vars/Rocky-8-default.yml @@ -27,3 +27,5 @@ service_list: - name: 'cockpit.socket' state: 'started' enabled: 'yes' +... + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml index 3e30e32..12890bf 100644 --- a/vars/Rocky-9-default.yml +++ b/vars/Rocky-9-default.yml @@ -22,3 +22,4 @@ service_list: state: 'started' enabled: 'yes' ... + From 5c5252c99b87dcb19ca90726c3f4cd85be1a8f55 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 21:50:34 -0500 Subject: [PATCH 30/32] Add Ubuntu support Signed-off-by: Jason Rothstein --- vars/Ubuntu-22-default.yml | 27 +++++++++++++++++++++++++++ vars/Ubuntu-24-default.yml | 27 +++++++++++++++++++++++++++ vars/Ubuntu-26-default.yml | 27 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 vars/Ubuntu-22-default.yml create mode 100644 vars/Ubuntu-24-default.yml create mode 100644 vars/Ubuntu-26-default.yml diff --git a/vars/Ubuntu-22-default.yml b/vars/Ubuntu-22-default.yml new file mode 100644 index 0000000..57e7336 --- /dev/null +++ b/vars/Ubuntu-22-default.yml @@ -0,0 +1,27 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... + diff --git a/vars/Ubuntu-24-default.yml b/vars/Ubuntu-24-default.yml new file mode 100644 index 0000000..57e7336 --- /dev/null +++ b/vars/Ubuntu-24-default.yml @@ -0,0 +1,27 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... + diff --git a/vars/Ubuntu-26-default.yml b/vars/Ubuntu-26-default.yml new file mode 100644 index 0000000..57e7336 --- /dev/null +++ b/vars/Ubuntu-26-default.yml @@ -0,0 +1,27 @@ +--- +# vars file for ensure_cockpit +package_list: + - name: 'cockpit' + state: 'present' + - name: 'cockpit-bridge' + state: 'present' + - name: 'cockpit-doc' + state: 'present' + - name: 'cockpit-networkmanager' + state: 'present' + - name: 'cockpit-packagekit' + state: 'present' + - name: 'cockpit-sosreport' + state: 'present' + - name: 'cockpit-storaged' + state: 'present' + - name: 'cockpit-system' + state: 'present' + - name: 'cockpit-ws' + state: 'present' +service_list: + - name: 'cockpit.socket' + state: 'started' + enabled: 'yes' +... + From 44312ad31659b8afbae0b2463d6e4eea5234d679 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 22:09:59 -0500 Subject: [PATCH 31/32] 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 b27fee2..394e4d4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -22,12 +22,12 @@ - name: 'package discovery' when: - ansible_facts["system"] == 'Linux' - - packages is not defined + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - 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 22021947aaba097f951bacd63bf8a16746a7b086 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 17:27:48 -0500 Subject: [PATCH 32/32] Fix handlers vs ansible core 2.20 Signed-off-by: Jason Rothstein --- handlers/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 564bb34..33b9f20 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,14 +6,14 @@ ansible.builtin.service_facts: - name: 'ensure_cockpit.service_reload' when: - - ansible_system == 'Linux' - - ansible_service_mgr == 'systemd' + - ansible_facts["system"] == 'Linux' + - ansible_facts["service_mgr"] == 'systemd' - ensure_cockpit is defined ansible.builtin.systemd: daemon_reload: 'yes' - name: 'ensure_cockpit.service_restart' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_cockpit is defined - ensure_cockpit.service_list is defined - ensure_cockpit.service_list is iterable