Skip to content

Commit

Permalink
Combine two conditions.
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock committed May 17, 2024
1 parent d7c0c4e commit a8d3ff6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The default values for the variables are set in [`defaults/main.yml`](https://gi
---
# defaults file for python_pip
# By default no modules should be installed. Note: This does not work on Debian Bookworm.
# By default no modules should be installed. Note: This does not work on Debian Bookworm and Ubuntu noble.
# See https://peps.python.org/pep-0668/
python_pip_modules: []
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# defaults file for python_pip

# By default no modules should be installed. Note: This does not work on Debian Bookworm.
# By default no modules should be installed. Note: This does not work on Debian Bookworm and Ubuntu noble.
# See https://peps.python.org/pep-0668/
python_pip_modules: []

Expand Down
6 changes: 2 additions & 4 deletions molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
name: docker
state: present
when:
- ansible_distribution_release != "noble"
- ansible_distribution_release != "bookworm"
- ansible_distribution_release not in [ "bookworm", "noble" ]
- ansible_os_family != "Alpine"

- name: Check if bootstrap still works.
Expand All @@ -23,6 +22,5 @@
name: docker
state: absent
when:
- ansible_distribution_release != "noble"
- ansible_distribution_release != "bookworm"
- ansible_distribution_release not in [ "bookworm", "noble" ]
- ansible_os_family != "Alpine"
3 changes: 1 addition & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
executable: "{{ python_pip_executable | default(omit) }}"
when:
- python_pip_update
- ansible_distribution_release != "bookworm"
- ansible_distribution_release != "noble"
- ansible_distribution_release not in [ "bookworm", "noble" ]
- ansible_os_family != "Alpine"

- name: Install requested modules
Expand Down

0 comments on commit a8d3ff6

Please sign in to comment.