From 63bfdd3a006fb0bd7244e2d4c988ccc8dbfad693 Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Mon, 30 Sep 2024 15:27:51 +0100
Subject: [PATCH] fix for ansible_facts.version.full
---
molecule/bookworm_cli/converge.yml | 4 ++--
molecule/bookworm_fpm/converge.yml | 9 +++++++++
molecule/default/converge.yml | 9 +++++++++
tasks/pkg.yml | 2 +-
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/molecule/bookworm_cli/converge.yml b/molecule/bookworm_cli/converge.yml
index 3d50f4f..fda50fd 100644
--- a/molecule/bookworm_cli/converge.yml
+++ b/molecule/bookworm_cli/converge.yml
@@ -35,9 +35,9 @@
var: ansible_facts
verbosity: 2
- - name: Debug ansible_version
+ - name: Debug ansible_version.full
ansible.builtin.debug:
- var: ansible_version
+ var: ansible_version.full
- name: Include php role as root
ansible.builtin.include_role:
diff --git a/molecule/bookworm_fpm/converge.yml b/molecule/bookworm_fpm/converge.yml
index 82d894a..434dd1a 100644
--- a/molecule/bookworm_fpm/converge.yml
+++ b/molecule/bookworm_fpm/converge.yml
@@ -30,6 +30,15 @@
ansible.builtin.debug:
var: ansible_facts.user_dir
+ - name: Debug ansible_facts
+ ansible.builtin.debug:
+ var: ansible_facts
+ verbosity: 2
+
+ - name: Debug ansible_version.full
+ ansible.builtin.debug:
+ var: ansible_version.full
+
- name: Include php role as root
ansible.builtin.include_role:
name: php
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 34bbb7d..c7c3395 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -30,6 +30,15 @@
ansible.builtin.debug:
var: ansible_facts.user_dir
+ - name: Debug ansible_facts
+ ansible.builtin.debug:
+ var: ansible_facts
+ verbosity: 2
+
+ - name: Debug ansible_version.full
+ ansible.builtin.debug:
+ var: ansible_version.full
+
- name: Include php role as root
ansible.builtin.include_role:
name: php
diff --git a/tasks/pkg.yml b/tasks/pkg.yml
index 749062e..c5e6caf 100644
--- a/tasks/pkg.yml
+++ b/tasks/pkg.yml
@@ -164,7 +164,7 @@
- name: Apt clean
ansible.builtin.include_tasks: apt_clean.yml
when: >-
- ( ansible_facts.version.full is version('2.13', '>=') ) and
+ ( ansible_version.full is version('2.13', '>=') ) and
( ( ( php_packages_installed.changed is defined ) and ( php_packages_installed.changed | bool ) ) or
( ( php_packages_removed_first_run.changed is defined ) and ( php_packages_removed_first_run.changed | bool ) ) or
( ( php_packages_removed_second_run.changed is defined ) and ( php_packages_removed_second_run.changed | bool ) ) )
--
GitLab