Skip to content
Snippets Groups Projects
Verified Commit 78c6a642 authored by Chris Croome's avatar Chris Croome
Browse files

updates for ANSIBLE_INJECT_FACT_VARS: "0"

parent 623ca624
No related branches found
No related tags found
No related merge requests found
......@@ -10,9 +10,13 @@
---
variables:
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
ANSIBLE_DEFAULT_VERBOSITY: "1"
ANSIBLE_DIFF_ALWAYS: "1"
ANSIBLE_DISPLAY_SKIPPED_HOSTS: "0"
ANSIBLE_ERROR_ON_UNDEFINED_VARS: "1"
ANSIBLE_FORCE_COLOR: "1"
ANSIBLE_INJECT_FACT_VARS: "0"
ANSIBLE_NOCOWS: "1"
ANSIBLE_REMOTE_TMP: "/tmp"
ANSIBLE_SHELL_ALLOW_WORLD_READABLE_TEMP: "1"
DEBIAN_FRONTEND: noninteractive
......@@ -36,28 +40,28 @@ stages:
- noble
- trixie
bookworm:
image: registry.git.coop/webarch/containers/images/bookworm:20240911
image: registry.git.coop/webarch/containers/images/bookworm:20241008
stage: bookworm
script:
- pre-commit install
- pre-commit run --all-files
- molecule test --all
jammy:
image: registry.git.coop/webarch/containers/images/jammy:20240911
image: registry.git.coop/webarch/containers/images/jammy:20241008
stage: jammy
script:
- pre-commit install
- pre-commit run --all-files
- molecule test --all
noble:
image: registry.git.coop/webarch/containers/images/noble:20240911
image: registry.git.coop/webarch/containers/images/noble:20241008
stage: noble
script:
- pre-commit install
- pre-commit run --all-files
- molecule test --all
trixie:
image: registry.git.coop/webarch/containers/images/trixie:20240911
image: registry.git.coop/webarch/containers/images/trixie:20241008
stage: trixie
script:
- pre-commit install
......
......@@ -25,7 +25,7 @@ repos:
- templates
# https://github.com/jackdewinter/pymarkdown/releases
- repo: https://github.com/jackdewinter/pymarkdown.git
rev: v0.9.23
rev: v0.9.24
hooks:
- id: pymarkdown
name: Markdown Lint
......
......@@ -18,17 +18,17 @@
ansible_python_interpreter: /usr/bin/python3
tasks:
- name: Debug ansible_effective_user_id
- name: Debug ansible_facts.effective_user_id
ansible.builtin.debug:
var: ansible_effective_user_id
var: ansible_facts.effective_user_id
- name: Debug ansible_user_id
- name: Debug ansible_facts.user_id
ansible.builtin.debug:
var: ansible_user_id
var: ansible_facts.user_id
- name: Debug ansible_user_dir
- name: Debug ansible_facts.user_dir
ansible.builtin.debug:
var: ansible_user_dir
var: ansible_facts.user_dir
- name: Include Systemd role as root
ansible.builtin.include_role:
......
......@@ -32,10 +32,10 @@
pkg:
- systemd
state: latest
default_release: "{{ ansible_distribution_release }}-backports"
default_release: "{{ ansible_facts.distribution_release }}-backports"
when: ( "-backports" in systemd_apt_cache_policy_systemd.stdout )
when: ansible_distribution_release is ansible.builtin.regex(systemd_backport_regex)
when: ansible_facts.distribution_release is ansible.builtin.regex(systemd_backport_regex)
# man-db is required by systemd-analyze verify
- name: Systemd and man-db present
......
......@@ -30,10 +30,10 @@
ansible.builtin.apt:
pkg: "{{ systemd_pkg }}"
state: latest
default_release: "{{ ansible_distribution_release }}-backports"
default_release: "{{ ansible_facts.distribution_release }}-backports"
when: ( "-backports" in systemd_apt_cache_policy_pkg.stdout )
when: ansible_distribution_release is ansible.builtin.regex(systemd_backport_regex)
when: ansible_facts.distribution_release is ansible.builtin.regex(systemd_backport_regex)
- name: Package present
ansible.builtin.apt:
......
......@@ -15,7 +15,7 @@ systemd_backport_distros:
- bullseye
- bookworm
systemd_backport_regex: "^{{ systemd_backport_distros | join('|') }}$"
systemd_file_backup: "{{ systemd_file.path | ansible.builtin.dirname }}/.{{ systemd_file.path | ansible.builtin.basename }}.{{ ansible_date_time.iso8601_basic_short }}.bak"
systemd_file_backup: "{{ systemd_file.path | ansible.builtin.dirname }}/.{{ systemd_file.path | ansible.builtin.basename }}.{{ ansible_facts.date_time.iso8601_basic_short }}.bak"
systemd_file_changed: false
systemd_unit_files_enabled_query: "[?state == 'enabled'].unit_file"
systemd_unit_names: "{{ systemd_units | community.general.json_query('[*].name') }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment