From 4cd907377201e1091316852f82317c3945634a1d Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sat, 9 Dec 2023 23:11:29 -0500 Subject: [PATCH] - fix for ansible-lint - fix for docker/podman - galaxy version bump - add temporary debug for ansible_virtualization_type --- galaxy.yml | 2 +- roles/resolv_conf/tasks/main.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index c5bddd7..05fc78c 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: jchristianh name: baseos # The version of the collection. Must be compatible with semantic versioning -version: 1.0.11 +version: 1.0.12 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/resolv_conf/tasks/main.yml b/roles/resolv_conf/tasks/main.yml index b0ce6c5..4d539cb 100644 --- a/roles/resolv_conf/tasks/main.yml +++ b/roles/resolv_conf/tasks/main.yml @@ -1,15 +1,17 @@ --- - name: Set resolv_conf_file if running in Docker - set_fact: + ansible.builtin.set_fact: __resolv_conf_file: "{{ __resolv_conf_file_docker }}" - when: ansible_virtualization_type == "docker" + when: + - ansible_virtualization_type == "docker" or + ansible_virtualization_type == "podman" - name: Deploy {{ __resolv_conf_file }} - template: + ansible.builtin.template: src: templates/resolv_conf.j2 dest: "{{ __resolv_conf_file }}" - mode: 0644 + mode: "0644" ...