diff --git a/playbooks/install.yaml b/playbooks/install.yaml index f5ec4824f..673eecca2 100644 --- a/playbooks/install.yaml +++ b/playbooks/install.yaml @@ -5,7 +5,6 @@ gather_facts: yes vars: bifrost_venv_dir: "{{ lookup('env', 'VENV') or '/opt/stack/bifrost' }}" - ansible_python_interpreter: "/usr/bin/env python3" pre_tasks: - name: install pip (and venv) to system package: diff --git a/playbooks/library/network_metadata.py b/playbooks/library/network_metadata.py index 377b70e11..33ec6f764 100644 --- a/playbooks/library/network_metadata.py +++ b/playbooks/library/network_metadata.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # coding: utf-8 -*- # (c) 2015, Hewlett-Packard Development Company, L.P. diff --git a/playbooks/library/os_ironic_node_info.py b/playbooks/library/os_ironic_node_info.py index 74c58f00b..e56fb4835 100644 --- a/playbooks/library/os_ironic_node_info.py +++ b/playbooks/library/os_ironic_node_info.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2015, Hewlett-Packard Development Company, L.P. # # This module is free software: you can redistribute it and/or modify diff --git a/releasenotes/notes/ansible10-c1423fcbaa2df981.yaml b/releasenotes/notes/ansible10-c1423fcbaa2df981.yaml new file mode 100644 index 000000000..5f9f735a9 --- /dev/null +++ b/releasenotes/notes/ansible10-c1423fcbaa2df981.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The default supported version of Ansible is now 10.x . diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh index 71f322b8a..e9e5bfeb5 100755 --- a/scripts/env-setup.sh +++ b/scripts/env-setup.sh @@ -6,7 +6,7 @@ set -euo pipefail # NOTE(pas-ha) the above exports some useful variables like # $PYTHON , $PIP and $VENV depending on venv install or not -DEFAULT_PIP_ANSIBLE='>=9,<10' +DEFAULT_PIP_ANSIBLE='>=10,<11' if ! python3 -c "import sys; assert sys.version_info >= (3, 10)" 2> /dev/null; then DEFAULT_PIP_ANSIBLE='>=8,<9' fi diff --git a/scripts/split_json.py b/scripts/split_json.py index a07c2b6c0..35cdd888f 100644 --- a/scripts/split_json.py +++ b/scripts/split_json.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2017 Mirantis Inc # diff --git a/tox.ini b/tox.ini index 39979a581..28bd5290e 100644 --- a/tox.ini +++ b/tox.ini @@ -79,8 +79,8 @@ filename = *.py [testenv:linters] allowlist_externals = bash deps = - ansible>=9,<10 - ansible-lint>=24,<25 + ansible>=10,<11 + ansible-lint>=25,<26 commands = bash tools/ansible-lint.sh @@ -91,4 +91,4 @@ deps = codespell # note(JayF): {posargs} lets us run `tox -ecodespell -- -w` to get codespell # to correct spelling issues in our code it's aware of. commands = - codespell {posargs} \ No newline at end of file + codespell {posargs}