From ac4a6e7c208a1935377685798f8df223b4c39e2e Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 10:47:38 -0600
Subject: [PATCH 01/53] fix(molecule): Reducing cores and memory

---
 molecule/default/molecule.yml     | 20 ++++++++++----------
 molecule/ipv6/molecule.yml        | 12 ++++++------
 molecule/single_node/molecule.yml |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 4a07503..5013112 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -7,8 +7,8 @@ platforms:
 
   - name: control1
     box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -23,8 +23,8 @@ platforms:
 
   - name: control2
     box: generic/debian11
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -34,8 +34,8 @@ platforms:
 
   - name: control3
     box: generic/rocky9
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -45,8 +45,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - node
@@ -61,8 +61,8 @@ platforms:
 
   - name: node2
     box: generic/rocky9
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml
index 2ad6423..4f6e0c5 100644
--- a/molecule/ipv6/molecule.yml
+++ b/molecule/ipv6/molecule.yml
@@ -6,8 +6,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -22,8 +22,8 @@ platforms:
 
   - name: control2
     box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -38,8 +38,8 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 2048
-    cpus: 2
+    memory: 1024
+    cpus: 1
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 1a7ed84..8eaf5ed 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 4096
+    memory: 1024
     cpus: 4
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,

From fecf7c7fb3ad7d3fc89c7263fc6dfdf310c6743d Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 11:10:43 -0600
Subject: [PATCH 02/53] fix(molecule): Reducing cores and memory

---
 molecule/single_node/molecule.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 8eaf5ed..1c50c00 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 4
+    cpus: 1
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405

From 9084c9067519aef1fdddb135c86da1a32dc04991 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:11:54 -0600
Subject: [PATCH 03/53] fix(ci): Add a cache prestep

---
 .github/workflows/cache.yml | 55 +++++++++++++++++++++++++++++++++++++
 .github/workflows/ci.yml    |  2 ++
 2 files changed, 57 insertions(+)
 create mode 100644 .github/workflows/cache.yml

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
new file mode 100644
index 0000000..60cc13b
--- /dev/null
+++ b/.github/workflows/cache.yml
@@ -0,0 +1,55 @@
+---
+name: "CI"
+on:
+  workflow_call:
+jobs:
+  molecule:
+    name: cache
+    runs-on: macos-12
+    env:
+      PYTHON_VERSION: "3.11"
+
+    steps:
+      - name: Check out the codebase
+        uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Cache pip
+        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Cache Vagrant boxes
+        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        with:
+          path: |
+            ~/.vagrant.d/boxes
+          key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
+          restore-keys: |
+            vagrant-boxes
+
+      - name: Download Vagrant boxes for all scenarios
+        # To save some cache space, all scenarios share the same cache key.
+        # On the other hand, this means that the cache contents should be
+        # the same across all scenarios. This step ensures that.
+        run: ./.github/download-boxes.sh
+
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'pip' # caching pip dependencies
+
+      - name: Install dependencies
+        run: |
+          echo "::group::Upgrade pip"
+          python3 -m pip install --upgrade pip
+          echo "::endgroup::"
+
+          echo "::group::Install Python requirements from requirements.txt"
+          python3 -m pip install -r requirements.txt
+          echo "::endgroup::"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54be8ff..4151e84 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   lint:
     uses: ./.github/workflows/lint.yml
+  cache:
+    uses: ./.github/workflows/cache.yml
   test:
     uses: ./.github/workflows/test.yml
     needs: [lint]

From 867eabcd7e2c0b5a4e8729bcac217b2a52287b0d Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:16:21 -0600
Subject: [PATCH 04/53] fix(ci): Add a cache prestep

---
 .github/workflows/cache.yml | 2 +-
 .github/workflows/ci.yml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 60cc13b..afbaa65 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -1,5 +1,5 @@
 ---
-name: "CI"
+name: "Cache"
 on:
   workflow_call:
 jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4151e84..e17245a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/lint.yml
   cache:
     uses: ./.github/workflows/cache.yml
+    needs: [lint]
   test:
     uses: ./.github/workflows/test.yml
-    needs: [lint]
+    needs: [lint,cache]

From 20ea0bc9981b36658eb0eb2b16ec547c28e4bcf2 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:18:29 -0600
Subject: [PATCH 05/53] fix(ci): Add a cache prestep

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e17245a..9d2fef5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,4 +15,4 @@ jobs:
     needs: [lint]
   test:
     uses: ./.github/workflows/test.yml
-    needs: [lint,cache]
+    needs: [lint, cache]

From f54eb1bf416c91c746747cf52e5aeeddc0cc43a9 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:26:18 -0600
Subject: [PATCH 06/53] fix(ci): Add a cache prestep

---
 .github/workflows/test.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10b6135..fc8fa64 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,15 +38,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - name: Cache Vagrant boxes
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
-        with:
-          path: |
-            ~/.vagrant.d/boxes
-          key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
-          restore-keys: |
-            vagrant-boxes
-
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
         # On the other hand, this means that the cache contents should be

From 7a8c7eccb6810389ed71a2c1ddcfbb41dd20036f Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:45:33 -0600
Subject: [PATCH 07/53] fix(ci): Add a cache prestep

---
 .github/workflows/cache.yml | 30 ------------------------------
 .github/workflows/test.yml  | 10 +++++-----
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index afbaa65..4b2e0f3 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -15,14 +15,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Cache pip
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: Cache Vagrant boxes
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
         with:
@@ -31,25 +23,3 @@ jobs:
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
           restore-keys: |
             vagrant-boxes
-
-      - name: Download Vagrant boxes for all scenarios
-        # To save some cache space, all scenarios share the same cache key.
-        # On the other hand, this means that the cache contents should be
-        # the same across all scenarios. This step ensures that.
-        run: ./.github/download-boxes.sh
-
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'pip' # caching pip dependencies
-
-      - name: Install dependencies
-        run: |
-          echo "::group::Upgrade pip"
-          python3 -m pip install --upgrade pip
-          echo "::endgroup::"
-
-          echo "::group::Install Python requirements from requirements.txt"
-          python3 -m pip install -r requirements.txt
-          echo "::endgroup::"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fc8fa64..8ba70a3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,13 +30,13 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
-      - name: Cache pip
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+      - name: Restore pip
+        uses: actions/cache/restore@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        id: cache
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          key: ${{ runner.os }}-pip-
+          fail-on-cache-miss: true
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.

From 7cfcd9727c2d5ea5c58480559c1c26be4a746e05 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 12:52:28 -0600
Subject: [PATCH 08/53] fix(ci): Add a cache prestep

---
 .github/workflows/cache.yml | 2 +-
 .github/workflows/lint.yml  | 4 ++--
 .github/workflows/test.yml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 4b2e0f3..6998dc1 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -16,7 +16,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Cache Vagrant boxes
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: |
             ~/.vagrant.d/boxes
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b43f5bb..f545e4e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
           cache: 'pip' # caching pip dependencies
 
       - name: Cache pip
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }}
@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Cache Ansible
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ba70a3..e570917 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
           EOF
 
       - name: Restore pip
-        uses: actions/cache/restore@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         id: cache
         with:
           path: ~/.cache/pip

From a2d4e91aa555b3834df532ae0ea9417792afeee5 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:06:16 -0600
Subject: [PATCH 09/53] fix(ci): Add a cache prestep

---
 .github/workflows/lint.yml |  8 --------
 .github/workflows/test.yml | 10 ++--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f545e4e..4f7b4c3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,14 +21,6 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
-      - name: Cache pip
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: Cache Ansible
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e570917..eb2a2e5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,14 +30,6 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
-      - name: Restore pip
-        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        id: cache
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-
-          fail-on-cache-miss: true
-
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
         # On the other hand, this means that the cache contents should be
@@ -46,9 +38,11 @@ jobs:
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
+        id: pip-cache
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
+      - run: echo '${{ steps.pip-cache.outputs.cache-hit }}' # true if cache-hit occurred on the primary key
 
       - name: Install dependencies
         run: |

From 3bb8984d7c056b1cd3638bc1a77de7fd813962c3 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:15:43 -0600
Subject: [PATCH 10/53] fix(ci): Add a cache prestep

---
 .github/workflows/test.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eb2a2e5..420b401 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,7 +42,6 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
-      - run: echo '${{ steps.pip-cache.outputs.cache-hit }}' # true if cache-hit occurred on the primary key
 
       - name: Install dependencies
         run: |
@@ -54,6 +53,14 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
+      - name: Cache Ansible
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-ansible-
+
       - name: Test with molecule
         run: molecule test --scenario-name ${{ matrix.scenario }}
         timeout-minutes: 90

From f2b87ec0975e936a71dc33d25823216e739e3cf7 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:20:36 -0600
Subject: [PATCH 11/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 20 +++++++++++++++++++-
 .github/workflows/test.yml  |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 6998dc1..e2e93b1 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: cache
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
@@ -23,3 +23,21 @@ jobs:
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
           restore-keys: |
             vagrant-boxes
+
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
+          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
+      - name: Configure Homebrew cache
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: |
+            ~/Library/Caches/Homebrew/virtualbox--*
+            ~/Library/Caches/Homebrew/vagrant--*
+            ~/Library/Caches/Homebrew/downloads/*--virtualbox-*
+            ~/Library/Caches/Homebrew/downloads/*--vagrant-*
+          key: brew-${{ hashFiles('.github/brew-formulae') }}
+          restore-keys: brew-
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 420b401..b7e3c63 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: Molecule
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         scenario:

From 0715ab94406a0186be8cf5ac355a43bf565561e8 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:37:10 -0600
Subject: [PATCH 12/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index e2e93b1..d9513c7 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
+          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From b7248f89d9aa946600a1f442e1455b84f62eaf5f Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:39:56 -0600
Subject: [PATCH 13/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index d9513c7..a4c331a 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,8 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/" > .github/brew-formulae
+          ls -l  "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/"
+          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 3345de29fc261b0d43f66e38a0b7a2049cdb3610 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:44:14 -0600
Subject: [PATCH 14/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index a4c331a..a19467c 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -28,7 +28,8 @@ jobs:
         run: |
           brew update --preinstall
           ls -l  "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/"
-          cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
+          # cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
+          cat "" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 50d60e6164a5731bd0ae17bb597b5d4f9af85da2 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:45:59 -0600
Subject: [PATCH 15/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index a19467c..1f1aa68 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -28,7 +28,6 @@ jobs:
         run: |
           brew update --preinstall
           ls -l  "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/"
-          # cat "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/foo.rb" > .github/brew-formulae
           cat "" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From 9117ec4b7ac4e7df3b22bcd5e7f6d53b94b1fa9a Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:48:07 -0600
Subject: [PATCH 16/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 1f1aa68..61d5ac0 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          ls -l  "$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/"
+          ls -l  "$(brew --repository)/Library"
           cat "" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From 0c640c5a954f393cfda0daace8633d66ef2c64ab Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:53:56 -0600
Subject: [PATCH 17/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 61d5ac0..7614522 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,8 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          ls -l  "$(brew --repository)/Library"
-          cat "" > .github/brew-formulae
+          echo "${{ hashFiles ($(brew --repository)) }}" > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 5b7794c6bfc68ff8b8fff9ce7cd6002ba849f4ac Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:55:16 -0600
Subject: [PATCH 18/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 7614522..60d4e60 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          echo "${{ hashFiles ($(brew --repository)) }}" > .github/brew-formulae
+          echo ${{ hashFiles ($(brew --repository)) }} > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 10f545ff300b2c0726bf6874beec35685cd6b379 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:56:20 -0600
Subject: [PATCH 19/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 60d4e60..f241c8c 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          echo ${{ hashFiles ($(brew --repository)) }} > .github/brew-formulae
+          echo ${{ hashFiles ("$(brew --repository)") }} > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 68f8f20cd72d7fc5517127dfcd1f26b31e01fab9 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 13:57:12 -0600
Subject: [PATCH 20/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index f241c8c..548b822 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          echo ${{ hashFiles ("$(brew --repository)") }} > .github/brew-formulae
+          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 03e0d00180b2b8e59563ccabddbc255b1eb12e8a Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 14:11:24 -0600
Subject: [PATCH 21/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml | 37 ++++++++++++++++++++-----------------
 .github/workflows/test.yml  |  6 ------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 548b822..890ec8a 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -15,6 +15,21 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
+          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
+      - name: Configure Homebrew cache
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: |
+            ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('.github/brew-formulae') }}
+          restore-keys: brew-
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+
       - name: Cache Vagrant boxes
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
@@ -24,20 +39,8 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
-      - name: Update Homebrew
-        run: |
-          brew update --preinstall
-          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
-      - name: Configure Homebrew cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        with:
-          path: |
-            ~/Library/Caches/Homebrew/virtualbox--*
-            ~/Library/Caches/Homebrew/vagrant--*
-            ~/Library/Caches/Homebrew/downloads/*--virtualbox-*
-            ~/Library/Caches/Homebrew/downloads/*--vagrant-*
-          key: brew-${{ hashFiles('.github/brew-formulae') }}
-          restore-keys: brew-
-      - name: Install Homebrew dependencies
-        run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+      - name: Download Vagrant boxes for all scenarios
+        # To save some cache space, all scenarios share the same cache key.
+        # On the other hand, this means that the cache contents should be
+        # the same across all scenarios. This step ensures that.
+        run: ./.github/download-boxes.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7e3c63..499493f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,12 +30,6 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
-      - name: Download Vagrant boxes for all scenarios
-        # To save some cache space, all scenarios share the same cache key.
-        # On the other hand, this means that the cache contents should be
-        # the same across all scenarios. This step ensures that.
-        run: ./.github/download-boxes.sh
-
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
         id: pip-cache

From 272e9cde2bd95237ca842c609447cda8b574ac0f Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 14:24:37 -0600
Subject: [PATCH 22/53] fix(ci): move to macos13

---
 .github/workflows/cache.yml |  1 +
 .github/workflows/test.yml  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 890ec8a..2977b87 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -19,6 +19,7 @@ jobs:
         run: |
           brew update --preinstall
           echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
+
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 499493f..bfa4164 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,28 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
+          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
+
+      - name: Restore Homebrew cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('.github/brew-formulae') }}
+
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+
+      - name: Restore vagrant Boxes cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.vagrant.d/boxes
+          key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
+
+
       - name: Configure VirtualBox
         run: |-
           sudo mkdir -p /etc/vbox

From 22a617734dbe136246bc11eee1c04e88eda93e65 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 14:24:51 -0600
Subject: [PATCH 23/53] fix(ci): move to macos13

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bfa4164..2124897 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,7 +43,6 @@ jobs:
           path: ~/.vagrant.d/boxes
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
 
-
       - name: Configure VirtualBox
         run: |-
           sudo mkdir -p /etc/vbox

From 0e233e1d0f22280e4d37d38c4b784fdc47aca91a Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 14:35:45 -0600
Subject: [PATCH 24/53] fix(ci): move to macos13

---
 .github/workflows/test.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2124897..7dcaedb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,17 +22,23 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Update Homebrew
-        run: |
-          brew update --preinstall
-          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
-
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/Library/Caches/Homebrew
           key: brew-${{ hashFiles('.github/brew-formulae') }}
 
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
+          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
+
+      - name: Restore Ansible cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+
       - name: Install Homebrew dependencies
         run: |
           env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
@@ -42,6 +48,7 @@ jobs:
         with:
           path: ~/.vagrant.d/boxes
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
+          fail-on-cache-miss: true
 
       - name: Configure VirtualBox
         run: |-

From f07009e0c56ba4c87f95f03cf78b9f86544b3671 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 14:49:06 -0600
Subject: [PATCH 25/53] fix(ci): move to macos13

---
 .github/workflows/test.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7dcaedb..c9bea73 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Restore Ansible cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
@@ -33,12 +39,6 @@ jobs:
           brew update --preinstall
           echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
-      - name: Restore Ansible cache
-        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        with:
-          path: ~/.ansible/collections
-          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
-
       - name: Install Homebrew dependencies
         run: |
           env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant

From 4b4922e1b6fa6a7b8da16b38ff45b2bcd71b5e32 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:11:38 -0600
Subject: [PATCH 26/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml             | 14 ++++++++++++++
 .github/workflows/ci.yml                |  8 ++++----
 .github/workflows/lint.yml              |  6 ++----
 .github/workflows/test.yml              |  9 +--------
 roles/k3s_server_post/defaults/main.yml |  2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 2977b87..3233921 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -15,6 +15,20 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'pip' # caching pip dependencies
+
+      - name: Cache Ansible
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        with:
+          path: ~/.ansible/collections
+          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-ansible-
+
       - name: Update Homebrew
         run: |
           brew update --preinstall
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d2fef5..c0b3b36 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,11 +8,11 @@ on:
     paths-ignore:
       - '**/README.md'
 jobs:
-  lint:
-    uses: ./.github/workflows/lint.yml
   cache:
     uses: ./.github/workflows/cache.yml
-    needs: [lint]
+  lint:
+    uses: ./.github/workflows/lint.yml
+    needs: [cache]
   test:
     uses: ./.github/workflows/test.yml
-    needs: [lint, cache]
+    needs: [cache, lint]
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4f7b4c3..40b0487 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,13 +21,11 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: 'pip' # caching pip dependencies
 
-      - name: Cache Ansible
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+      - name: Restore Ansible cache
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-ansible-
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9bea73..9fb4ea0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,13 +58,6 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3
-        id: pip-cache
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'pip' # caching pip dependencies
-
       - name: Install dependencies
         run: |
           echo "::group::Upgrade pip"
@@ -89,7 +82,7 @@ jobs:
         env:
           ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }}
           ANSIBLE_SSH_RETRIES: 4
-          ANSIBLE_TIMEOUT: 60
+          ANSIBLE_TIMEOUT: 120
           PY_COLORS: 1
           ANSIBLE_FORCE_COLOR: 1
 
diff --git a/roles/k3s_server_post/defaults/main.yml b/roles/k3s_server_post/defaults/main.yml
index 1c458fa..bbf9629 100644
--- a/roles/k3s_server_post/defaults/main.yml
+++ b/roles/k3s_server_post/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Timeout to wait for MetalLB services to come up
-metal_lb_available_timeout: 120s
+metal_lb_available_timeout: 240s
 
 # Name of the master group
 group_name_master: master

From 7c1b17a40c93e1c8130589f324bc740860d538ec Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:14:37 -0600
Subject: [PATCH 27/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 3233921..b586323 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -29,11 +29,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-ansible-
 
-      - name: Update Homebrew
-        run: |
-          brew update --preinstall
-          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
-
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
@@ -45,6 +40,11 @@ jobs:
         run: |
           env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
 
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
+          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
+
       - name: Cache Vagrant boxes
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From 2333e851484ec7c28f21ef7acfa22ce130416f00 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:17:04 -0600
Subject: [PATCH 28/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 4 ++--
 .github/workflows/lint.yml  | 2 +-
 .github/workflows/test.yml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index b586323..2c357bf 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -25,9 +25,9 @@ jobs:
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-ansible-
+            ansible-
 
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 40b0487..e7108e2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9fb4ea0..27c0bdc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,7 +72,7 @@ jobs:
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
 

From c3597a96231b6ba4d853ff16290718b8abf78ed7 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:19:52 -0600
Subject: [PATCH 29/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 2c357bf..a71110b 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -29,6 +29,12 @@ jobs:
           restore-keys: |
             ansible-
 
+      - name: Install dependencies
+        run: |
+          echo "::group::Install Ansible role requirements from collections/requirements.yml"
+          ansible-galaxy install -r collections/requirements.yml
+          echo "::endgroup::"
+
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:

From d66e74597965eea3f314afb1b8d3b1ceb1c5d09a Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:20:26 -0600
Subject: [PATCH 30/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index a71110b..45e4412 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -31,6 +31,14 @@ jobs:
 
       - name: Install dependencies
         run: |
+          echo "::group::Upgrade pip"
+          python3 -m pip install --upgrade pip
+          echo "::endgroup::"
+
+          echo "::group::Install Python requirements from requirements.txt"
+          python3 -m pip install -r requirements.txt
+          echo "::endgroup::"
+
           echo "::group::Install Ansible role requirements from collections/requirements.yml"
           ansible-galaxy install -r collections/requirements.yml
           echo "::endgroup::"

From dfdcff7e1122cf053cfad4f311000a514fd91184 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:26:36 -0600
Subject: [PATCH 31/53] fix(ci): adjusting cache steps

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 27c0bdc..360e9d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.txt') }}
 
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From eb7046fb34b6812b0e4d7172c2e737b8d392cd58 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:35:30 -0600
Subject: [PATCH 32/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 45e4412..03fd122 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -60,8 +60,10 @@ jobs:
           echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
       - name: Cache Vagrant boxes
+        id: cache-vagrant
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
+          lookup-only: true #if it exists, we don't need to restore and can skip the next step
           path: |
             ~/.vagrant.d/boxes
           key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }}
@@ -72,4 +74,5 @@ jobs:
         # To save some cache space, all scenarios share the same cache key.
         # On the other hand, this means that the cache contents should be
         # the same across all scenarios. This step ensures that.
+        if: steps.cache-vagrant.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: ./.github/download-boxes.sh

From 0c4bafa70c18811c6657eff0ab4a9a04da790a13 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:37:51 -0600
Subject: [PATCH 33/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 03fd122..dfe06b7 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -50,15 +50,16 @@ jobs:
             ~/Library/Caches/Homebrew
           key: brew-${{ hashFiles('.github/brew-formulae') }}
           restore-keys: brew-
-      - name: Install Homebrew dependencies
-        run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
 
       - name: Update Homebrew
         run: |
           brew update --preinstall
           echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+
       - name: Cache Vagrant boxes
         id: cache-vagrant
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From f8e408b3bd08db9eae3a4b0309b1ed033b409587 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:40:17 -0600
Subject: [PATCH 34/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index dfe06b7..c74d2e2 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -45,6 +45,7 @@ jobs:
 
       - name: Configure Homebrew cache
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-homebrew
         with:
           path: |
             ~/Library/Caches/Homebrew
@@ -52,11 +53,13 @@ jobs:
           restore-keys: brew-
 
       - name: Update Homebrew
+        if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: |
           brew update --preinstall
           echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
       - name: Install Homebrew dependencies
+        if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: |
           env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
 

From 980622fdbd0258fd7d4324e21bc11bd85c4c6f94 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 15:42:13 -0600
Subject: [PATCH 35/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index c74d2e2..83b20cc 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -23,6 +23,7 @@ jobs:
 
       - name: Cache Ansible
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-ansible
         with:
           path: ~/.ansible/collections
           key: ansible-${{ hashFiles('collections/requirements.txt') }}
@@ -39,6 +40,9 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
+      - name: Install ansible dependencies
+        if: steps.cache-ansible.outputs.cache-hit != 'true' # only run if false since this is just a cache step
+        run: |
           echo "::group::Install Ansible role requirements from collections/requirements.yml"
           ansible-galaxy install -r collections/requirements.yml
           echo "::endgroup::"

From 5cc46eb360da50a757fdc0700b035a0075fd76e7 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:00:24 -0600
Subject: [PATCH 36/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 2 +-
 .github/workflows/test.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 83b20cc..afb6f70 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Install Homebrew dependencies
         if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask virtualbox vagrant vagrant-manager
 
       - name: Cache Vagrant boxes
         id: cache-vagrant
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 360e9d7..c9fcd6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Install Homebrew dependencies
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install virtualbox vagrant
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask virtualbox vagrant vagrant-manager
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From f767c32bf8f2e46564bfe7f336021d1df799257d Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:09:59 -0600
Subject: [PATCH 37/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 5 ++---
 .github/workflows/test.yml  | 5 ++---
 Brewfile                    | 5 +++++
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 Brewfile

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index afb6f70..02f2fe8 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -53,19 +53,18 @@ jobs:
         with:
           path: |
             ~/Library/Caches/Homebrew
-          key: brew-${{ hashFiles('.github/brew-formulae') }}
+          key: brew-${{ hashFiles('./Brewfile') }}
           restore-keys: brew-
 
       - name: Update Homebrew
         if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: |
           brew update --preinstall
-          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
       - name: Install Homebrew dependencies
         if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask virtualbox vagrant vagrant-manager
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
 
       - name: Cache Vagrant boxes
         id: cache-vagrant
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9fcd6f..7a41f23 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,16 +32,15 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/Library/Caches/Homebrew
-          key: brew-${{ hashFiles('.github/brew-formulae') }}
+          key: brew-${{ hashFiles('./Brewfile') }}
 
       - name: Update Homebrew
         run: |
           brew update --preinstall
-          echo ${{ hashFiles ('"$(brew --repository)"') }} > .github/brew-formulae
 
       - name: Install Homebrew dependencies
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask virtualbox vagrant vagrant-manager
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
diff --git a/Brewfile b/Brewfile
new file mode 100644
index 0000000..49d4e96
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,5 @@
+tap "homebrew/bundle"
+tap "homebrew/cask-versions"
+cask "virtualbox"
+cask "vagrant"
+cask "vagrant-manager"

From cdfee6f1e9110f14586d512c001e9f821963c9a5 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:28:19 -0600
Subject: [PATCH 38/53] fix(ci): adjusting cache steps

---
 molecule/default/molecule.yml     | 10 +++++-----
 molecule/ipv6/molecule.yml        |  6 +++---
 molecule/single_node/molecule.yml |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5013112..4177ece 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -24,7 +24,7 @@ platforms:
   - name: control2
     box: generic/debian11
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -35,7 +35,7 @@ platforms:
   - name: control3
     box: generic/rocky9
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -46,7 +46,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node
@@ -62,7 +62,7 @@ platforms:
   - name: node2
     box: generic/rocky9
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml
index 4f6e0c5..cf5b171 100644
--- a/molecule/ipv6/molecule.yml
+++ b/molecule/ipv6/molecule.yml
@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -23,7 +23,7 @@ platforms:
   - name: control2
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - master
@@ -39,7 +39,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 1c50c00..d27b195 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 1
+    cpus: 2
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405

From 7f7e0e7921d4eca3407ade2c959a3f26385a1f60 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:32:26 -0600
Subject: [PATCH 39/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 40 +++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 02f2fe8..41ff776 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -47,25 +47,6 @@ jobs:
           ansible-galaxy install -r collections/requirements.yml
           echo "::endgroup::"
 
-      - name: Configure Homebrew cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        id: cache-homebrew
-        with:
-          path: |
-            ~/Library/Caches/Homebrew
-          key: brew-${{ hashFiles('./Brewfile') }}
-          restore-keys: brew-
-
-      - name: Update Homebrew
-        if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
-        run: |
-          brew update --preinstall
-
-      - name: Install Homebrew dependencies
-        if: steps.cache-homebrew.outputs.cache-hit != 'true' # only run if false since this is just a cache step
-        run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
-
       - name: Cache Vagrant boxes
         id: cache-vagrant
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
@@ -77,6 +58,27 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
+      - name: Configure Homebrew cache
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-homebrew
+        with:
+          path: |
+            ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('./Brewfile') }}
+          restore-keys: brew-
+
+      - name: Update Homebrew
+        if: | # only run if false since this is just a cache step
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+        run: |
+          brew update --preinstall
+
+      - name: Install Homebrew dependencies
+        if: | # only run if false since this is just a cache step
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
+
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
         # On the other hand, this means that the cache contents should be

From 82d36572f136ee9c5262fe7bd952f144bb403ee0 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:47:41 -0600
Subject: [PATCH 40/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 2 +-
 .github/workflows/test.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 41ff776..c582796 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -77,7 +77,7 @@ jobs:
         if: | # only run if false since this is just a cache step
           steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --cache --file ./Brewfile
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7a41f23..8e4e220 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Install Homebrew dependencies
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --file ./Brewfile
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --cache --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From f6597e859d4f61fb066ec3a226a91dd9c5544a87 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 16:51:29 -0600
Subject: [PATCH 41/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml | 2 +-
 .github/workflows/test.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index c582796..b230183 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -77,7 +77,7 @@ jobs:
         if: | # only run if false since this is just a cache step
           steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --cache --file ./Brewfile
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e4e220..f856193 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Install Homebrew dependencies
         run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --cache --file ./Brewfile
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

From 4f635eb0efbba8094df23adaa3e67ed54a9a6c86 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 17:16:46 -0600
Subject: [PATCH 42/53] fix(ci): adjusting cache steps

---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 49d4e96..b3bf958 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,5 +1,5 @@
 tap "homebrew/bundle"
 tap "homebrew/cask-versions"
-cask "virtualbox"
+cask "virtualbox6"
 cask "vagrant"
 cask "vagrant-manager"

From 59e76924b8996b49326e25f95d98aa5b770aa7a3 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 17:33:57 -0600
Subject: [PATCH 43/53] fix(ci): adjusting cache steps

---
 Brewfile                          | 1 -
 molecule/single_node/molecule.yml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Brewfile b/Brewfile
index b3bf958..9e1bcdc 100644
--- a/Brewfile
+++ b/Brewfile
@@ -2,4 +2,3 @@ tap "homebrew/bundle"
 tap "homebrew/cask-versions"
 cask "virtualbox6"
 cask "vagrant"
-cask "vagrant-manager"
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index d27b195..1a7ed84 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -6,8 +6,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 1024
-    cpus: 2
+    memory: 4096
+    cpus: 4
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405

From 5a36416ccb39d077538357f386a6f3f9cfc575d6 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 17:54:20 -0600
Subject: [PATCH 44/53] fix(ci): adjusting cache steps

---
 .github/workflows/lint.yml | 2 +-
 Brewfile                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e7108e2..f92ef06 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
diff --git a/Brewfile b/Brewfile
index 9e1bcdc..24a6659 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,4 +1,5 @@
 tap "homebrew/bundle"
 tap "homebrew/cask-versions"
-cask "virtualbox6"
+
+cask "virtualbox"
 cask "vagrant"

From 4b8c97c7150758310a49906b7f38ad39769d1fd0 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 18:01:02 -0600
Subject: [PATCH 45/53] fix(ci): adjusting cache steps

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f92ef06..e8b0354 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -46,7 +46,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     steps:
       - name: Checkout code
         uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0

From eb89255d590e623613b11ba2871d624ae704bebd Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 18:28:51 -0600
Subject: [PATCH 46/53] fix(ci): adjusting cache steps

---
 .github/workflows/lint.yml | 2 +-
 .github/workflows/test.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e8b0354..580d0ce 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.yml') }}
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f856193..fab34d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.yml') }}
 
       - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
@@ -71,7 +71,7 @@ jobs:
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
 

From f7869f447d42f975a4301d0285e3c18e4eba322c Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 18:32:57 -0600
Subject: [PATCH 47/53] fix(ci): adjusting cache steps

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fab34d5..173a654 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -73,7 +73,7 @@ jobs:
           path: ~/.ansible/collections
           key: ansible-${{ hashFiles('collections/requirements.yml') }}
           restore-keys: |
-            ${{ runner.os }}-ansible-
+            ansible-
 
       - name: Test with molecule
         run: molecule test --scenario-name ${{ matrix.scenario }}

From fc8ab77be422aeb8bc9c638233ec325ad361bb63 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 18:42:29 -0600
Subject: [PATCH 48/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml |  2 +-
 .github/workflows/test.yml  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index b230183..f26f63a 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -26,7 +26,7 @@ jobs:
         id: cache-ansible
         with:
           path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.txt') }}
+          key: ansible-${{ hashFiles('collections/requirements.yml') }}
           restore-keys: |
             ansible-
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 173a654..2235484 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,13 +67,9 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
-      - name: Cache Ansible
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        with:
-          path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.yml') }}
-          restore-keys: |
-            ansible-
+          echo "::group::Install Ansible role requirements from collections/requirements.yml"
+          ansible-galaxy install -r collections/requirements.yml
+          echo "::endgroup::"
 
       - name: Test with molecule
         run: molecule test --scenario-name ${{ matrix.scenario }}

From 8acec7055a1b99e522171b1c664dfe2b71718b36 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 19:59:25 -0600
Subject: [PATCH 49/53] fix(ci): adjusting cache steps

---
 .github/workflows/cache.yml       | 38 +++++++++++++++----------------
 .github/workflows/lint.yml        |  4 ++--
 .github/workflows/test.yml        | 24 +++++++++----------
 molecule/default/molecule.yml     | 10 ++++----
 molecule/ipv6/molecule.yml        |  6 ++---
 molecule/single_node/molecule.yml |  4 ++--
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index f26f63a..6c8a376 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: cache
-    runs-on: macos-13
+    runs-on: macos-12
     env:
       PYTHON_VERSION: "3.11"
 
@@ -58,26 +58,26 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
-      - name: Configure Homebrew cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        id: cache-homebrew
-        with:
-          path: |
-            ~/Library/Caches/Homebrew
-          key: brew-${{ hashFiles('./Brewfile') }}
-          restore-keys: brew-
+      # - name: Configure Homebrew cache
+      #   uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+      #   id: cache-homebrew
+      #   with:
+      #     path: |
+      #       ~/Library/Caches/Homebrew
+      #     key: brew-${{ hashFiles('./Brewfile') }}
+      #     restore-keys: brew-
 
-      - name: Update Homebrew
-        if: | # only run if false since this is just a cache step
-          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
-        run: |
-          brew update --preinstall
+      # - name: Update Homebrew
+      #   if: | # only run if false since this is just a cache step
+      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+      #   run: |
+      #     brew update --preinstall
 
-      - name: Install Homebrew dependencies
-        if: | # only run if false since this is just a cache step
-          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
-        run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
+      # - name: Install Homebrew dependencies
+      #   if: | # only run if false since this is just a cache step
+      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+      #   run: |
+      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 580d0ce..8bb1f84 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: macos-13
+    runs-on: macos-12
     env:
       PYTHON_VERSION: "3.11"
 
@@ -46,7 +46,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: macos-13
+    runs-on: macos-12
     steps:
       - name: Checkout code
         uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2235484..dcf8cdc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: Molecule
-    runs-on: macos-13
+    runs-on: macos-12
     strategy:
       matrix:
         scenario:
@@ -28,19 +28,19 @@ jobs:
           path: ~/.ansible/collections
           key: ansible-${{ hashFiles('collections/requirements.yml') }}
 
-      - name: Restore Homebrew cache
-        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-        with:
-          path: ~/Library/Caches/Homebrew
-          key: brew-${{ hashFiles('./Brewfile') }}
+      # - name: Restore Homebrew cache
+      #   uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+      #   with:
+      #     path: ~/Library/Caches/Homebrew
+      #     key: brew-${{ hashFiles('./Brewfile') }}
 
-      - name: Update Homebrew
-        run: |
-          brew update --preinstall
+      # - name: Update Homebrew
+      #   run: |
+      #     brew update --preinstall
 
-      - name: Install Homebrew dependencies
-        run: |
-          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
+      # - name: Install Homebrew dependencies
+      #   run: |
+      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 4177ece..5013112 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -24,7 +24,7 @@ platforms:
   - name: control2
     box: generic/debian11
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -35,7 +35,7 @@ platforms:
   - name: control3
     box: generic/rocky9
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -46,7 +46,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
@@ -62,7 +62,7 @@ platforms:
   - name: node2
     box: generic/rocky9
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml
index cf5b171..4f6e0c5 100644
--- a/molecule/ipv6/molecule.yml
+++ b/molecule/ipv6/molecule.yml
@@ -7,7 +7,7 @@ platforms:
   - name: control1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -23,7 +23,7 @@ platforms:
   - name: control2
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - master
@@ -39,7 +39,7 @@ platforms:
   - name: node1
     box: generic/ubuntu2204
     memory: 1024
-    cpus: 2
+    cpus: 1
     groups:
       - k3s_cluster
       - node
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 1a7ed84..1c50c00 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -6,8 +6,8 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 4096
-    cpus: 4
+    memory: 1024
+    cpus: 1
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,
       # see: https://github.com/chef/bento/issues/1405

From b9d94f36750d1decd17f8468f7e3c0aad4d55615 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 21:13:24 -0600
Subject: [PATCH 50/53] fix(ci): adjusting cache steps

---
 molecule/default/molecule.yml     | 10 +++++-----
 molecule/ipv6/molecule.yml        |  6 +++---
 molecule/single_node/molecule.yml |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5013112..d1c4504 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -7,7 +7,7 @@ platforms:
 
   - name: control1
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -23,7 +23,7 @@ platforms:
 
   - name: control2
     box: generic/debian11
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -34,7 +34,7 @@ platforms:
 
   - name: control3
     box: generic/rocky9
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -45,7 +45,7 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -61,7 +61,7 @@ platforms:
 
   - name: node2
     box: generic/rocky9
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml
index 4f6e0c5..38ac495 100644
--- a/molecule/ipv6/molecule.yml
+++ b/molecule/ipv6/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -22,7 +22,7 @@ platforms:
 
   - name: control2
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
@@ -38,7 +38,7 @@ platforms:
 
   - name: node1
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     groups:
       - k3s_cluster
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 1c50c00..9e45297 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: control1
     box: generic/ubuntu2204
-    memory: 1024
+    memory: 512
     cpus: 1
     config_options:
       # We currently can not use public-key based authentication on Ubuntu 22.04,

From 0ae666dfe5de4995f76ae64fad0a7da6c3154e50 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 22:04:09 -0600
Subject: [PATCH 51/53] fix(post): Fix liquid formatting

---
 .github/workflows/test.yml        | 3 +++
 molecule/default/molecule.yml     | 2 ++
 molecule/ipv6/molecule.yml        | 2 ++
 molecule/single_node/molecule.yml | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dcf8cdc..83cc5df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,6 +57,9 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
+      - name: Add Vagrant Boxes
+        run: ./.github/download-boxes.sh
+
       - name: Install dependencies
         run: |
           echo "::group::Upgrade pip"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index d1c4504..6421d71 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -72,6 +72,8 @@ platforms:
 
 provisioner:
   name: ansible
+  env:
+    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml
diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml
index 38ac495..364788f 100644
--- a/molecule/ipv6/molecule.yml
+++ b/molecule/ipv6/molecule.yml
@@ -53,6 +53,8 @@ platforms:
       ssh.password: "vagrant"
 provisioner:
   name: ansible
+  env:
+    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml
diff --git a/molecule/single_node/molecule.yml b/molecule/single_node/molecule.yml
index 9e45297..43969f0 100644
--- a/molecule/single_node/molecule.yml
+++ b/molecule/single_node/molecule.yml
@@ -21,6 +21,8 @@ platforms:
         ip: 192.168.30.50
 provisioner:
   name: ansible
+  env:
+    ANSIBLE_VERBOSITY: 3
   playbooks:
     converge: ../resources/converge.yml
     side_effect: ../resources/reset.yml

From ffcc79300a468e03dcc78491b88b8413d0c6e0fd Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 22:25:22 -0600
Subject: [PATCH 52/53] fix(ci): adjusting cache steps

---
 .github/add-boxes.sh       | 24 ++++++++++++++++++++++++
 .github/workflows/test.yml |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 .github/add-boxes.sh

diff --git a/.github/add-boxes.sh b/.github/add-boxes.sh
new file mode 100755
index 0000000..62894f0
--- /dev/null
+++ b/.github/add-boxes.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# add-boxes.sh
+# list add boxes on system and add
+# already present on the system.
+
+set -euo pipefail
+
+PROVIDER=virtualbox
+
+# Read the boxes that are currently present on the system (for the current provider)
+present_boxes=$(
+    (vagrant box list |
+        grep "${PROVIDER}" | # Filter by boxes available for the current provider
+        awk '{print $1;}' |  # The box name is the first word in each line
+        sort |
+        uniq) ||
+        echo "" # In case any of these commands fails, just use an empty list
+)
+
+# Add all boxes
+  echo "${present_boxes}" | while IFS= read -r box; do
+      vagrant box add --provider "${PROVIDER}" "${box}"
+  done
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 83cc5df..d03e4cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,7 +58,7 @@ jobs:
           EOF
 
       - name: Add Vagrant Boxes
-        run: ./.github/download-boxes.sh
+        run: ./.github/add-boxes.sh
 
       - name: Install dependencies
         run: |

From 4707002267990f4c526ea4201e90d25df0662c20 Mon Sep 17 00:00:00 2001
From: Timothy Stewart <timothystewart6@gmail.com>
Date: Sun, 21 Jan 2024 22:35:47 -0600
Subject: [PATCH 53/53] fix(ci): adjusting cache steps

---
 .github/add-boxes.sh        | 24 -----------------------
 .github/workflows/cache.yml | 38 ++++++++++++++++++-------------------
 .github/workflows/lint.yml  |  4 ++--
 .github/workflows/test.yml  | 33 ++++++++++----------------------
 4 files changed, 31 insertions(+), 68 deletions(-)
 delete mode 100755 .github/add-boxes.sh

diff --git a/.github/add-boxes.sh b/.github/add-boxes.sh
deleted file mode 100755
index 62894f0..0000000
--- a/.github/add-boxes.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# add-boxes.sh
-# list add boxes on system and add
-# already present on the system.
-
-set -euo pipefail
-
-PROVIDER=virtualbox
-
-# Read the boxes that are currently present on the system (for the current provider)
-present_boxes=$(
-    (vagrant box list |
-        grep "${PROVIDER}" | # Filter by boxes available for the current provider
-        awk '{print $1;}' |  # The box name is the first word in each line
-        sort |
-        uniq) ||
-        echo "" # In case any of these commands fails, just use an empty list
-)
-
-# Add all boxes
-  echo "${present_boxes}" | while IFS= read -r box; do
-      vagrant box add --provider "${PROVIDER}" "${box}"
-  done
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
index 6c8a376..f26f63a 100644
--- a/.github/workflows/cache.yml
+++ b/.github/workflows/cache.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: cache
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
@@ -58,26 +58,26 @@ jobs:
           restore-keys: |
             vagrant-boxes
 
-      # - name: Configure Homebrew cache
-      #   uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-      #   id: cache-homebrew
-      #   with:
-      #     path: |
-      #       ~/Library/Caches/Homebrew
-      #     key: brew-${{ hashFiles('./Brewfile') }}
-      #     restore-keys: brew-
+      - name: Configure Homebrew cache
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
+        id: cache-homebrew
+        with:
+          path: |
+            ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('./Brewfile') }}
+          restore-keys: brew-
 
-      # - name: Update Homebrew
-      #   if: | # only run if false since this is just a cache step
-      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
-      #   run: |
-      #     brew update --preinstall
+      - name: Update Homebrew
+        if: | # only run if false since this is just a cache step
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+        run: |
+          brew update --preinstall
 
-      # - name: Install Homebrew dependencies
-      #   if: | # only run if false since this is just a cache step
-      #     steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
-      #   run: |
-      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
+      - name: Install Homebrew dependencies
+        if: | # only run if false since this is just a cache step
+          steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Download Vagrant boxes for all scenarios
         # To save some cache space, all scenarios share the same cache key.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8bb1f84..580d0ce 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   pre-commit-ci:
     name: Pre-Commit
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       PYTHON_VERSION: "3.11"
 
@@ -46,7 +46,7 @@ jobs:
 
   ensure-pinned-actions:
     name: Ensure SHA Pinned Actions
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Checkout code
         uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d03e4cc..27cdd5c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   molecule:
     name: Molecule
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         scenario:
@@ -22,25 +22,19 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Restore Ansible cache
+      - name: Restore Homebrew cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
         with:
-          path: ~/.ansible/collections
-          key: ansible-${{ hashFiles('collections/requirements.yml') }}
+          path: ~/Library/Caches/Homebrew
+          key: brew-${{ hashFiles('./Brewfile') }}
 
-      # - name: Restore Homebrew cache
-      #   uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
-      #   with:
-      #     path: ~/Library/Caches/Homebrew
-      #     key: brew-${{ hashFiles('./Brewfile') }}
+      - name: Update Homebrew
+        run: |
+          brew update --preinstall
 
-      # - name: Update Homebrew
-      #   run: |
-      #     brew update --preinstall
-
-      # - name: Install Homebrew dependencies
-      #   run: |
-      #     env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
+      - name: Install Homebrew dependencies
+        run: |
+          env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade  --file ./Brewfile
 
       - name: Restore vagrant Boxes cache
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
@@ -57,9 +51,6 @@ jobs:
           * fdad:bad:ba55::/64
           EOF
 
-      - name: Add Vagrant Boxes
-        run: ./.github/add-boxes.sh
-
       - name: Install dependencies
         run: |
           echo "::group::Upgrade pip"
@@ -70,10 +61,6 @@ jobs:
           python3 -m pip install -r requirements.txt
           echo "::endgroup::"
 
-          echo "::group::Install Ansible role requirements from collections/requirements.yml"
-          ansible-galaxy install -r collections/requirements.yml
-          echo "::endgroup::"
-
       - name: Test with molecule
         run: molecule test --scenario-name ${{ matrix.scenario }}
         timeout-minutes: 90