Skip to content

Commit 19610e4

Browse files
committed
Revert "podman: remove ansible_async_dir setting logic (#182)"
This reverts commit 0244719. Signed-off-by: Wong Hoi Sing Edison <[email protected]>
1 parent b48ead5 commit 19610e4

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

src/molecule_plugins/podman/playbooks/create.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
vars:
99
podman_exec: "{{ lookup('env','MOLECULE_PODMAN_EXECUTABLE')|default('podman',true) }}"
1010
tasks:
11+
- name: Get passwd entries for USER env
12+
ansible.builtin.getent:
13+
database: passwd
14+
key: "{{ lookup('env', 'USER') }}"
15+
16+
- name: Get shell async_dir
17+
ansible.builtin.set_fact:
18+
_shell_async_dir: >-
19+
{{ lookup('ansible.builtin.config', 'async_dir', plugin_type='shell', plugin_name='sh')
20+
| regex_replace('^~', ansible_facts.getent_passwd[lookup('env', 'USER')][4]) }}
21+
22+
- name: Set async_dir for HOME env
23+
ansible.builtin.set_fact:
24+
ansible_async_dir: >-
25+
{{ _shell_async_dir
26+
| regex_replace('^' + ansible_facts.getent_passwd[lookup('env', 'USER')][4], lookup('env', 'HOME')) }}
27+
when: lookup('env', 'HOME') != ansible_facts.getent_passwd[lookup('env', 'USER')][4]
28+
1129
- name: Log into a container registry
1230
containers.podman.podman_login:
1331
certdir: >-

src/molecule_plugins/podman/playbooks/destroy.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
vars:
99
podman_exec: "{{ lookup('env','MOLECULE_PODMAN_EXECUTABLE')|default('podman',true) }}"
1010
tasks:
11+
- name: Get passwd entries for USER env
12+
ansible.builtin.getent:
13+
database: passwd
14+
key: "{{ lookup('env', 'USER') }}"
15+
16+
- name: Get shell async_dir
17+
ansible.builtin.set_fact:
18+
_shell_async_dir: >-
19+
{{ lookup('ansible.builtin.config', 'async_dir', plugin_type='shell', plugin_name='sh')
20+
| regex_replace('^~', ansible_facts.getent_passwd[lookup('env', 'USER')][4]) }}
21+
22+
- name: Set async_dir for HOME env
23+
ansible.builtin.set_fact:
24+
ansible_async_dir: >-
25+
{{ _shell_async_dir
26+
| regex_replace('^' + ansible_facts.getent_passwd[lookup('env', 'USER')][4], lookup('env', 'HOME')) }}
27+
when: lookup('env', 'HOME') != ansible_facts.getent_passwd[lookup('env', 'USER')][4]
28+
1129
- name: Destroy molecule instance(s)
1230
ansible.builtin.shell: "{{ podman_exec }} container exists {{ item.name }} && {{ podman_exec }} rm -f {{ item.name }} || true"
1331
register: server

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ passenv =
5858
SSL_CERT_FILE
5959
TOXENV
6060
TWINE_*
61+
USER
6162
OS_*
6263
allowlist_externals =
6364
bash

0 commit comments

Comments
 (0)