Skip to content

Commit b23bc4f

Browse files
committed
Default ansible to version 10.x
Ansible 9 EOL is in May 2025. Yep, a couple of weeks to go. Using interpreter auto discovery (default) as ansible_python_interpreter behavior has changed causing mayhem, for example see ansible/ansible#83476 Depends-On: Ie03307aac1dffc5cf397a2513c2c44d403a2d2b7 Change-Id: Ia939bb5da97981e1d5ce3e29056fed884f29fc45 Signed-off-by: Riccardo Pittau <[email protected]>
1 parent 4757b87 commit b23bc4f

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

playbooks/install.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
gather_facts: yes
66
vars:
77
bifrost_venv_dir: "{{ lookup('env', 'VENV') or '/opt/stack/bifrost' }}"
8-
ansible_python_interpreter: "/usr/bin/env python3"
98
pre_tasks:
109
- name: install pip (and venv) to system
1110
package:

playbooks/library/network_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/python3
22
# coding: utf-8 -*-
33

44
# (c) 2015, Hewlett-Packard Development Company, L.P.

playbooks/library/os_ironic_node_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/python3
22
# (c) 2015, Hewlett-Packard Development Company, L.P.
33
#
44
# This module is free software: you can redistribute it and/or modify
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
The default supported version of Ansible is now 10.x .

scripts/env-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -euo pipefail
66
# NOTE(pas-ha) the above exports some useful variables like
77
# $PYTHON , $PIP and $VENV depending on venv install or not
88

9-
DEFAULT_PIP_ANSIBLE='>=9,<10'
9+
DEFAULT_PIP_ANSIBLE='>=10,<11'
1010
if ! python3 -c "import sys; assert sys.version_info >= (3, 10)" 2> /dev/null; then
1111
DEFAULT_PIP_ANSIBLE='>=8,<9'
1212
fi

scripts/split_json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
#
33
# Copyright (c) 2017 Mirantis Inc
44
#

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ filename = *.py
7979
[testenv:linters]
8080
allowlist_externals = bash
8181
deps =
82-
ansible>=9,<10
83-
ansible-lint>=24,<25
82+
ansible>=10,<11
83+
ansible-lint>=25,<26
8484
commands =
8585
bash tools/ansible-lint.sh
8686

@@ -91,4 +91,4 @@ deps = codespell
9191
# note(JayF): {posargs} lets us run `tox -ecodespell -- -w` to get codespell
9292
# to correct spelling issues in our code it's aware of.
9393
commands =
94-
codespell {posargs}
94+
codespell {posargs}

0 commit comments

Comments
 (0)