Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make role work on el 8.8 and el 9.2 and podman version less than 4.7.0 #188

Merged
merged 1 commit into from
Oct 28, 2024
Merged

fix: make role work on el 8.8 and el 9.2 and podman version less than 4.7.0 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tasks/cancel_linger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
removes: /var/lib/systemd/linger/{{ __podman_linger_user }}

- name: Wait for user session to exit closing state # noqa no-handler
command: loginctl show-user -P State {{ __podman_linger_user | quote }}
command: loginctl show-user --value -p State {{ __podman_linger_user | quote }}
register: __user_state
changed_when: false
until: __user_state.stdout != "closing"
Expand All @@ -82,7 +82,7 @@
state: stopped

- name: Wait for user session to exit closing state
command: loginctl show-user -P State {{ __podman_linger_user | quote }}
command: loginctl show-user --value -p State {{ __podman_linger_user | quote }}
changed_when: false
register: __user_state
until: __user_state.stderr is match(__pat) or
Expand Down
2 changes: 2 additions & 0 deletions tests/files/quadlet-basic.network → tests/templates/quadlet-basic.network.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
Subnet=192.168.29.0/24
Gateway=192.168.29.1
Label=app=wordpress
{% if podman_version is version("4.7.0", ">=") %}
NetworkName=quadlet-basic-name
{% endif %}
6 changes: 3 additions & 3 deletions tests/tests_quadlet_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
state: present
data: "{{ __json_secret_data | string }}"
__podman_quadlet_specs:
- file_src: files/quadlet-basic.network
- template_src: templates/quadlet-basic.network.j2
state: started
- name: quadlet-basic-unused-network
type: network
Network: {}
- name: quadlet-basic-mysql
type: volume
Volume:
VolumeName: quadlet-basic-mysql-name
Volume: "{{ {} if podman_version is version('4.7.0', '<')
else {'VolumeName': 'quadlet-basic-mysql-name'} }}"
- name: quadlet-basic-unused-volume
type: volume
Volume: {}
Expand Down
Loading