Skip to content

Commit

Permalink
podman: remove ansible_async_dir setting logic (#182)
Browse files Browse the repository at this point in the history
podman: remove ansible_async_dir from create.yml and destroy.yml

b5509a1 uses $USER to get the home for the current user, but
if the controller does not run login(1), like in containers, the variable is not set.
Since the original bug that needed ansible_async_dir was fixed (see ansible-community/molecule-podman PR #139 and ansible/creator-ee#19),
remove all the related changes.

- src/molecule_plugins/podman/playbooks: remove ansible_async_dir tasks from create.yml and destroy.yml
- tox.ini: remove USER from the pass_env list
  • Loading branch information
grcancelliere authored Nov 14, 2023
1 parent 7e34182 commit 0244719
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 37 deletions.
18 changes: 0 additions & 18 deletions src/molecule_plugins/podman/playbooks/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@
ansible.builtin.set_fact:
podman_cmd: "{{ _podman_path.stdout }}"

- name: Get passwd entries for USER env
ansible.builtin.getent:
database: passwd
key: "{{ lookup('env', 'USER') }}"

- name: Get shell async_dir
ansible.builtin.set_fact:
_shell_async_dir: >-
{{ lookup('ansible.builtin.config', 'async_dir', plugin_type='shell', plugin_name='sh')
| regex_replace('^~', ansible_facts.getent_passwd[lookup('env', 'USER')][4]) }}
- name: Set async_dir for HOME env
ansible.builtin.set_fact:
ansible_async_dir: >-
{{ _shell_async_dir
| regex_replace('^' + ansible_facts.getent_passwd[lookup('env', 'USER')][4], lookup('env', 'HOME')) }}
when: lookup('env', 'HOME') != ansible_facts.getent_passwd[lookup('env', 'USER')][4]

- name: Log into a container registry
ansible.builtin.command: >
{{ podman_cmd }} login
Expand Down
18 changes: 0 additions & 18 deletions src/molecule_plugins/podman/playbooks/destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,6 @@
vars:
podman_exec: "{{ lookup('env','MOLECULE_PODMAN_EXECUTABLE')|default('podman',true) }}"
tasks:
- name: Get passwd entries for USER env
ansible.builtin.getent:
database: passwd
key: "{{ lookup('env', 'USER') }}"

- name: Get shell async_dir
ansible.builtin.set_fact:
_shell_async_dir: >-
{{ lookup('ansible.builtin.config', 'async_dir', plugin_type='shell', plugin_name='sh')
| regex_replace('^~', ansible_facts.getent_passwd[lookup('env', 'USER')][4]) }}
- name: Set async_dir for HOME env
ansible.builtin.set_fact:
ansible_async_dir: >-
{{ _shell_async_dir
| regex_replace('^' + ansible_facts.getent_passwd[lookup('env', 'USER')][4], lookup('env', 'HOME')) }}
when: lookup('env', 'HOME') != ansible_facts.getent_passwd[lookup('env', 'USER')][4]

- name: Destroy molecule instance(s)
ansible.builtin.shell: "{{ podman_exec }} container exists {{ item.name }} && {{ podman_exec }} rm -f {{ item.name }} || true"
register: server
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ passenv =
SSL_CERT_FILE
TOXENV
TWINE_*
USER
allowlist_externals =
bash
twine
Expand Down

0 comments on commit 0244719

Please sign in to comment.