From 5ba779a23388bdffe59540c508b9f873373c972f Mon Sep 17 00:00:00 2001
From: AnsibleRoles <>
Date: Sun, 20 Dec 2020 22:48:33 +0000
Subject: [PATCH 01/16] Initial commit

---
 .gitignore |  97 +++++++++++++++++++++++++++++++
 LICENSE    | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md  |   2 +
 3 files changed, 262 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..7a6ae95
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,97 @@
+# ---> 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
+
+# ---> 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*
+
+# ---> 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
+
+# ---> Vim
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
diff --git a/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. <http s ://fsf.org/>
+
+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..9b0bb48
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# ensure_docker
+

From 12837a432799644c5879ac6d22e63c13feaac0de Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 20 Dec 2020 17:20:10 -0600
Subject: [PATCH 02/16] Initial Role

---
 .travis.yml       | 29 ++++++++++++++++++++++++++
 README.md         | 38 ++++++++++++++++++++++++++++++++-
 defaults/main.yml |  2 ++
 handlers/main.yml |  7 +++++++
 meta/main.yml     | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 tasks/main.yml    |  2 ++
 tests/inventory   |  2 ++
 tests/test.yml    |  5 +++++
 vars/main.yml     |  2 ++
 9 files changed, 139 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 9b0bb48..225dd44 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,38 @@
-# ensure_docker
+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..dd0b198
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ensure_docker
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..ed3a078
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+# handlers file for ensure_docker
+- name: 'ensure_docker.package_facts'
+  ansible.builtin.package_facts:
+- name: 'ensure_docker.service_facts'
+  ansible.builtin.service_facts:
+
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..227ad9c
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,53 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.9
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
+  
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
new file mode 100644
index 0000000..cf22675
--- /dev/null
+++ b/tasks/main.yml
@@ -0,0 +1,2 @@
+---
+# tasks file for ensure_docker
\ 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..cde5271
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ensure_docker
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
new file mode 100644
index 0000000..66619a9
--- /dev/null
+++ b/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_docker
\ No newline at end of file

From 63421a34615592e87b1805c934371ecf199b736c Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 20 Dec 2020 17:31:30 -0600
Subject: [PATCH 03/16] Enable docker for CentOS >= 7 and Fedora >= 30

---
 tasks/main.yml     | 87 +++++++++++++++++++++++++++++++++++++++++++++-
 vars/CentOS-7.yml  | 11 ++++++
 vars/CentOS-8.yml  | 11 ++++++
 vars/Fedora-30.yml | 13 +++++++
 vars/Fedora-31.yml | 13 +++++++
 vars/Fedora-32.yml | 11 ++++++
 vars/Fedora-33.yml | 11 ++++++
 vars/default.yml   |  2 ++
 8 files changed, 158 insertions(+), 1 deletion(-)
 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
 create mode 100644 vars/Fedora-33.yml
 create mode 100644 vars/default.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index cf22675..696431b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,2 +1,87 @@
 ---
-# tasks file for ensure_docker
\ No newline at end of file
+# tasks file for ensure_docker
+- name: 'include variables'
+  when:
+    - ansible_system == 'Linux'
+  include_vars:
+    file: '{{ lookup("first_found", findme ) }}'
+    name: 'ensure_docker'
+  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: 'service discovery'
+  when:
+    - ansible_system == 'Linux'
+    - services is not defined
+  ansible.builtin.service_facts:
+- name: 'ensure packages'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_docker is defined
+    - ensure_docker.package_list is defined
+    - ensure_docker.package_list is iterable
+    - packages[item.name] is not defined
+  ansible.builtin.package:
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_docker.package_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_docker.package_facts'
+    - 'ensure_docker.service_facts'
+- name: 'ensure services'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_docker is defined
+    - ensure_docker.service_list is defined
+    - ensure_docker.service_list is iterable
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_docker.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_docker.package_facts'
+    - 'ensure_docker.service_facts'
+- name: 'Fetch kernel command line'
+  when:
+    - ansible_system = 'Linux'
+    - ensure_docker is defined
+    - ansible_distribution == 'Fedora'
+    - ansible_distribution_major_version is version('32', '>=')
+  shell: |
+    cat /proc/cmdline
+  register: 'results'
+  changed_when: 'false'
+- name: 'Add cgroups v1 if disabled'
+  when:
+    - results is defined
+    - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
+  shell:
+    cmd: |
+      grubby --update-kernel=ALL --args=systemd.unified_cgroup_hierarchy=0
+- name: 'Reboot to enable cgroups v1'
+  when:
+    - results is defined
+    - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
+  reboot:
+- name: 'flush handlers'
+  meta: 'flush_handlers'
diff --git a/vars/CentOS-7.yml b/vars/CentOS-7.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/CentOS-7.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/CentOS-8.yml b/vars/CentOS-8.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/CentOS-8.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-30.yml b/vars/Fedora-30.yml
new file mode 100644
index 0000000..161d154
--- /dev/null
+++ b/vars/Fedora-30.yml
@@ -0,0 +1,13 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'cockpit-docker'
+    state: 'present'
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-31.yml b/vars/Fedora-31.yml
new file mode 100644
index 0000000..161d154
--- /dev/null
+++ b/vars/Fedora-31.yml
@@ -0,0 +1,13 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'cockpit-docker'
+    state: 'present'
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-32.yml b/vars/Fedora-32.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/Fedora-32.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-33.yml b/vars/Fedora-33.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/Fedora-33.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/default.yml b/vars/default.yml
new file mode 100644
index 0000000..66619a9
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_docker
\ No newline at end of file

From df274f95c1f592998a1fe308cd30f44639cfc6aa Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 20 Dec 2020 17:40:57 -0600
Subject: [PATCH 04/16] Fix syntax

---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 696431b..41b4ef5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -63,7 +63,7 @@
     - 'ensure_docker.service_facts'
 - name: 'Fetch kernel command line'
   when:
-    - ansible_system = 'Linux'
+    - ansible_system == 'Linux'
     - ensure_docker is defined
     - ansible_distribution == 'Fedora'
     - ansible_distribution_major_version is version('32', '>=')

From d57ae74762002caf18656b50588e0634846d1dc0 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 8 Feb 2021 21:28:25 -0600
Subject: [PATCH 05/16] Ensure correct variable file names

---
 vars/{CentOS-7.yml => CentOS-7-default.yml}   | 0
 vars/{CentOS-8.yml => CentOS-8-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
 6 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-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-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 ca310a26e14dd2abb67df42c23f20ecfe2dece7d Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 8 Feb 2021 22:14:56 -0600
Subject: [PATCH 06/16] Only run grubby if cat runs (fixes check mode)

---
 tasks/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index 41b4ef5..b778e6f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -74,6 +74,7 @@
 - name: 'Add cgroups v1 if disabled'
   when:
     - results is defined
+    - results.stdout is defined
     - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
   shell:
     cmd: |
@@ -81,6 +82,7 @@
 - name: 'Reboot to enable cgroups v1'
   when:
     - results is defined
+    - results.stdout is defined
     - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
   reboot:
 - name: 'flush handlers'

From 5d8a74cab11c97839f99895a7338955c26bc196b Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 8 Feb 2021 22:20:04 -0600
Subject: [PATCH 07/16] Add debugging to find out why check mode is broken

---
 tasks/main.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index b778e6f..3fdd83c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -71,6 +71,9 @@
     cat /proc/cmdline
   register: 'results'
   changed_when: 'false'
+- name: 'debug'
+  debug:
+    var: 'results'
 - name: 'Add cgroups v1 if disabled'
   when:
     - results is defined
@@ -79,6 +82,9 @@
   shell:
     cmd: |
       grubby --update-kernel=ALL --args=systemd.unified_cgroup_hierarchy=0
+- name: 'debug'
+  debug:
+    var: 'results'
 - name: 'Reboot to enable cgroups v1'
   when:
     - results is defined

From 496081ebca9c5cf7298b946e5d7f702220e07b99 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 8 Feb 2021 22:21:59 -0600
Subject: [PATCH 08/16] Remove debugt, everything is working

---
 tasks/main.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 3fdd83c..b778e6f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -71,9 +71,6 @@
     cat /proc/cmdline
   register: 'results'
   changed_when: 'false'
-- name: 'debug'
-  debug:
-    var: 'results'
 - name: 'Add cgroups v1 if disabled'
   when:
     - results is defined
@@ -82,9 +79,6 @@
   shell:
     cmd: |
       grubby --update-kernel=ALL --args=systemd.unified_cgroup_hierarchy=0
-- name: 'debug'
-  debug:
-    var: 'results'
 - name: 'Reboot to enable cgroups v1'
   when:
     - results is defined

From 8f6b8b1e9a26419aa7ba253c2c210cac032f50e7 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 8 Feb 2021 22:41:16 -0600
Subject: [PATCH 09/16] Use ansible_cmdline to detect cgroup status

---
 tasks/main.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index b778e6f..a5a4afe 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -61,29 +61,25 @@
   notify:
     - 'ensure_docker.package_facts'
     - 'ensure_docker.service_facts'
-- name: 'Fetch kernel command line'
+- name: 'Ensure cgroups are v1 only'
   when:
     - ansible_system == 'Linux'
     - ensure_docker is defined
     - ansible_distribution == 'Fedora'
     - ansible_distribution_major_version is version('32', '>=')
-  shell: |
-    cat /proc/cmdline
-  register: 'results'
-  changed_when: 'false'
-- name: 'Add cgroups v1 if disabled'
-  when:
-    - results is defined
-    - results.stdout is defined
-    - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
+    - ansible_cmdline is defined
+    - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is not defined
   shell:
     cmd: |
       grubby --update-kernel=ALL --args=systemd.unified_cgroup_hierarchy=0
 - name: 'Reboot to enable cgroups v1'
   when:
-    - results is defined
-    - results.stdout is defined
-    - ' "systemd.unified_cgroup_hierarchy=0" not in results.stdout '
+    - ansible_system == 'Linux'
+    - ensure_docker is defined
+    - ansible_distribution == 'Fedora'
+    - ansible_distribution_major_version is version('32', '>=')
+    - ansible_cmdline is defined
+    - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is not defined
   reboot:
 - name: 'flush handlers'
   meta: 'flush_handlers'

From ec2d9f921d807206162a365358da8486807dcfc6 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Tue, 29 Jun 2021 22:24:50 -0500
Subject: [PATCH 10/16] Enable Fedora 34

---
 vars/Fedora-34-default.yml | 11 +++++++++++
 1 file changed, 11 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..e953c3f
--- /dev/null
+++ b/vars/Fedora-34-default.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'

From d006eab01729615ea7a4476008384493b554506d Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Wed, 21 Jul 2021 02:40:28 +0000
Subject: [PATCH 11/16] Update task template for config files when required

---
 tasks/main.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index a5a4afe..8c7d74c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -45,6 +45,31 @@
   notify:
     - 'ensure_docker.package_facts'
     - 'ensure_docker.service_facts'
+- name: 'ensure configurations'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_docker is defined
+    - ensure_docker.template_list is defined
+    - ensure_docker.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_docker.template_list }}'
+  loop_control:
+    label: '{{ item.dest }} will be ensured'
+  notify:
+    - 'ensure_docker.package_facts'
+    - 'ensure_docker.service_facts'
+- name: 'flush handlers'
+  meta: 'flush_handlers'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'

From ee149db9f3e1daeb1f1da06d49db7123e0be4e1b Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 Jul 2021 03:49:51 +0000
Subject: [PATCH 12/16] Prevent multiple service restarts

---
 tasks/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 8c7d74c..5f3b7ce 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -68,8 +68,6 @@
   notify:
     - 'ensure_docker.package_facts'
     - 'ensure_docker.service_facts'
-- name: 'flush handlers'
-  meta: 'flush_handlers'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'
@@ -108,3 +106,4 @@
   reboot:
 - name: 'flush handlers'
   meta: 'flush_handlers'
+

From b43fee5cab821d10528836bb42bfb4fed33402fe Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:29:23 -0500
Subject: [PATCH 13/16] Update handlers

---
 handlers/main.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index ed3a078..fcf7f1d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,4 +4,24 @@
   ansible.builtin.package_facts:
 - name: 'ensure_docker.service_facts'
   ansible.builtin.service_facts:
-
+- name: 'ensure_docker.service_reload'
+  when:
+    - ansible_system == 'Linux'
+    - ansible_service_mgr == 'systemd'
+    - ensure_docker is defined
+  ansible.builtin.systemd:
+    daemon_reload: 'yes'
+- name: 'ensure_docker.services'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_docker is defined
+    - ensure_docker.service_list is defined
+    - ensure_docker.service_list is iterable
+    - item.state == 'started'
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: 'restarted'
+  loop: '{{ ensure_docker.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be restarted'

From 3a5c44e509780abed3db40ba41efd92ab878bd78 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:47:39 -0500
Subject: [PATCH 14/16] Update tasks

---
 tasks/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 5f3b7ce..e92b205 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -35,7 +35,6 @@
     - ensure_docker is defined
     - ensure_docker.package_list is defined
     - ensure_docker.package_list is iterable
-    - packages[item.name] is not defined
   ansible.builtin.package:
     name: '{{ item.name }}'
     state: '{{ item.state }}'

From b365b64a86856a8741b15f6ad4e234f9f06e1b84 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Tue, 6 Dec 2022 21:59:17 -0600
Subject: [PATCH 15/16] Add Fedora 35/36/37

---
 vars/Fedora-35-default.yml | 11 +++++++++++
 vars/Fedora-36-default.yml | 11 +++++++++++
 vars/Fedora-37-default.yml | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 vars/Fedora-35-default.yml
 create mode 100644 vars/Fedora-36-default.yml
 create mode 100644 vars/Fedora-37-default.yml

diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/Fedora-35-default.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/Fedora-36-default.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'
diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml
new file mode 100644
index 0000000..e953c3f
--- /dev/null
+++ b/vars/Fedora-37-default.yml
@@ -0,0 +1,11 @@
+---
+# vars file for ensure_docker
+package_list:
+  - name: 'docker-compose'
+    state: 'present'
+  - name: 'moby-engine'
+    state: 'present'
+service_list:
+  - name: 'docker.socket'
+    state: 'started'
+    enabled: 'yes'

From 8eb486161de13955010406cc9d6ed08f4c62981c Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 May 2025 20:06:14 -0500
Subject: [PATCH 16/16] Handler improvements

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 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 fcf7f1d..9bd2040 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -11,7 +11,7 @@
     - ensure_docker is defined
   ansible.builtin.systemd:
     daemon_reload: 'yes'
-- name: 'ensure_docker.services'
+- name: 'ensure_docker.service_restart'
   when:
     - ansible_system == 'Linux'
     - ensure_docker is defined
@@ -25,3 +25,5 @@
   loop: '{{ ensure_docker.service_list }}'
   loop_control:
     label: '{{ item.name }} will be restarted'
+...
+
diff --git a/tasks/main.yml b/tasks/main.yml
index e92b205..844f734 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -67,6 +67,8 @@
   notify:
     - 'ensure_docker.package_facts'
     - 'ensure_docker.service_facts'
+    - 'ensure_docker.service_restart'
+    - 'ensure_docker.service_reload'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'
@@ -105,4 +107,5 @@
   reboot:
 - name: 'flush handlers'
   meta: 'flush_handlers'
+...