Skip to content

Synchronise master with upstream #509

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

Merged
Alex-Welsh merged 2 commits into from
Dec 15, 2025
Merged

Synchronise master with upstream #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec06645
Revert "[release] Use OpenStack 2025.2 release"
priteau Dec 5, 2025
3c2cf92
CI: Ensure firewalld is unmasked
priteau Dec 9, 2025
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
6 changes: 3 additions & 3 deletions ansible/inventory/group_vars/all/openstack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.

# Name of the current OpenStack release. Default is "2025.2".
openstack_release: "2025.2"
# Name of the current OpenStack release. Default is "master".
openstack_release: "master"

# Name of the current OpenStack branch. Default is "stable/2025.2".
# Name of the current OpenStack branch. Default is "master".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/openstack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.

# Name of the current OpenStack release. Default is "2025.2".
# Name of the current OpenStack release. Default is "master".
#openstack_release:

# Name of the current OpenStack branch. Default is "stable/2025.2".
# Name of the current OpenStack branch. Default is "master".
#openstack_branch:

###############################################################################
Expand Down
6 changes: 6 additions & 0 deletions playbooks/kayobe-overcloud-host-configure-base/pre.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,9 @@
become: true
loop: "{{ range(2, 8) | list }}"
when: ansible_facts.os_family == 'Debian'

- name: Ensure firewalld is unmasked
ansible.builtin.systemd_service:
name: firewalld
masked: false
become: true
2 changes: 1 addition & 1 deletion requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
collections:
- name: https://opendev.org/openstack/ansible-collection-kolla
type: git
version: stable/2025.2
version: master
- name: community.docker
version: 3.11.0
- name: community.network
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ setenv =
OS_TEST_TIMEOUT=60
ANSIBLE_VERBOSITY=3
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}

[testenv:pep8]
# sphinx8 needs the sphinx package which is required via doc/requirements.txt
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt
Expand All @@ -42,7 +42,7 @@ commands =

[testenv:venv]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = {posargs}
Expand All @@ -60,7 +60,7 @@ commands =

[testenv:molecule]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/molecule-requirements.txt
commands =
Expand Down Expand Up @@ -131,7 +131,7 @@ commands =

[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html
Expand Down
8 changes: 0 additions & 8 deletions zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,11 @@
required-projects:
# Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
override-checkout: stable/2025.2
- name: openstack/kayobe
- name: openstack/kayobe-config-dev
- name: openstack/kolla
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
override-checkout: stable/2025.2
- name: openstack/kolla-ansible
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
override-checkout: stable/2025.2
- name: openstack/requirements
# TODO(priteau): Remove when kayobe stable/2025.2 exists.
override-checkout: stable/2025.2
- name: openstack/tenks
irrelevant-files:
- ^\..+
Expand Down