Skip to content

Commit 83bbe86

Browse files
authored
Merge pull request #79 from stackhpc/upstream/master-2025-07-21
Synchronise master with upstream
2 parents 1e2c961 + 034609e commit 83bbe86

File tree

9 files changed

+23
-9
lines changed

9 files changed

+23
-9
lines changed

doc/source/user/howto.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ example:
2121
2222
export OS_CLOUD=bifrost
2323
baremetal node list
24-
baremetal introspection list
2524
2625
.. note::
2726
Previously, a separate cloud ``bifrost-inspector`` was provided for

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 .
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
deprecations:
3+
- |
4+
Since support for the ironic-inspector service is deprecated in Ironic,
5+
it is also deprecated in Bifrost, together with the ``enable_inspector``
6+
variable. They will be removed in the 2026.1 release cycle.
7+
8+
Bifrost users that set ``enable_inspector`` to ``true`` should check
9+
the `ironic-inspector migration guide
10+
<https://docs.openstack.org/ironic/latest/admin/inspection/migration.html>`_
11+
for information on how to migrate to the native in-band inspection
12+
in Ironic.

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)