From 6acb700fe7806c3cdca2af1c469dde317d49b9ed Mon Sep 17 00:00:00 2001
From: linuxbandit <bellicaf@tcd.ie>
Date: Sun, 2 Jun 2024 14:43:09 +0300
Subject: [PATCH] Fix: ansible roles were fixed (#1320)

* fix: update pyenv role to something not broken

* fix: pin the correct version of compose on ansible role misbehaviour

somehow you gotta specify the default value of docker_install_compose, and absolutely avoid to install the plugin (which by default should be like this, but is not)

* chore: fix yamllint
---
 scripts-vagrant_provision/local.yml           | 18 +++++++++--
 scripts-vagrant_provision/provision.yml       | 32 +++++++++----------
 .../requirements-ansible.yml                  |  6 ++--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/scripts-vagrant_provision/local.yml b/scripts-vagrant_provision/local.yml
index 7ba32894..eeedbcae 100644
--- a/scripts-vagrant_provision/local.yml
+++ b/scripts-vagrant_provision/local.yml
@@ -4,9 +4,23 @@ npm_version: "9.6.4"
 
 python_version: "3.10.3"
 
-docker_version: "19.03.5"
+docker_version: "19.03.15"
 docker_ubuntu_version: "5:{{ docker_version }}~3-0~ubuntu-bionic"
-docker_compose_version: "1.24.0"
+docker_compose_version: "1.29.2"
 docker_users: ["vagrant"]
 
+docker_install_compose: true
+docker_compose_package_state: absent
+
+docker_packages:
+  - "docker-{{ docker_edition }}={{docker_ubuntu_version}}"
+  - "docker-{{ docker_edition }}-cli={{docker_ubuntu_version}}"
+  # - "docker-{{ docker_edition }}-rootless-extras={{docker_ubuntu_version}}"
+docker_daemon_options:
+  log-driver: "json-file"
+  log-opts:
+    max-size: "10m"
+    max-file: "2"
+    labels: "host-{{ ansible_hostname }}"
+
 packages_to_install: ['make', 'jq', 'net-tools', 'vim', 'sqlite3', 'cowsay', 'figlet']
diff --git a/scripts-vagrant_provision/provision.yml b/scripts-vagrant_provision/provision.yml
index 160beb2f..c40785d0 100644
--- a/scripts-vagrant_provision/provision.yml
+++ b/scripts-vagrant_provision/provision.yml
@@ -13,6 +13,17 @@
 
 ---
 
+- name: Upgrade apt cache
+  hosts: all
+  become: true
+  tags: ['pyenv', 'node', 'docker', 'packages'] #  before any task
+
+  pre_tasks:
+    - name: Update apt-cache
+      apt:
+        update_cache: yes
+        cache_valid_time: 36000
+
 - name: Prerequisites - folders
   hosts: all
   become: yes
@@ -54,8 +65,7 @@
         - npm
       when: current_node_version.stdout != nodejs_version
 
-- name: Install pyenv with better role but possibly with a deprecation inside
-  # TODO: pyenv role uses deprecated stuff?
+- name: Prerequisites - python
   hosts: all
   tags: ['pyenv']
 
@@ -69,11 +79,11 @@
       ignore_errors: yes
 
   roles:
-    - role: avanov.pyenv
+    - role: staticdev.pyenv
       vars:
         pyenv_path: "{{ ansible_env.HOME }}/.pyenv"
         pyenv_python_versions: ["{{ python_version }}"]
-        pyenv_global: "{{ python_version }}"
+        pyenv_global: ["{{ python_version }}"]
         pyenv_virtualenvs:
           - venv_name: "notifications"
             py_version: "{{ python_version }}"
@@ -85,7 +95,7 @@
   #     pip:
   #       requirements: /vagrant/scripts-vagrant_provision/requirements.txt
 
-- name: Prerequisites - node/python itself
+- name: Prerequisites - node
   hosts: all
   become: no  # role asked so
   tags: ['node']
@@ -105,18 +115,6 @@
   become: true
   tags: ['docker']
 
-  vars:
-    docker_packages:
-      - "docker-{{ docker_edition }}={{docker_ubuntu_version}}"
-      - "docker-{{ docker_edition }}-cli={{docker_ubuntu_version}}"
-      # - "docker-{{ docker_edition }}-rootless-extras={{docker_ubuntu_version}}"
-    docker_daemon_options:
-      log-driver: "json-file"
-      log-opts:
-        max-size: "10m"
-        max-file: "2"
-        labels: "host-{{ ansible_hostname }}"
-
   roles:
     - geerlingguy.docker
 
diff --git a/scripts-vagrant_provision/requirements-ansible.yml b/scripts-vagrant_provision/requirements-ansible.yml
index f5915a5f..db777f0e 100644
--- a/scripts-vagrant_provision/requirements-ansible.yml
+++ b/scripts-vagrant_provision/requirements-ansible.yml
@@ -1,7 +1,7 @@
 ---
 - name: geerlingguy.docker
-  version: '6.1.0'
+  version: '7.1.0'
 - name: morgangraphics.ansible_role_nvm
   version: 'v2.0.0'
-- name: avanov.pyenv
-  version: '1.1.0'
+- name: staticdev.pyenv
+  version: '2.11.0'