diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack index a7a6e4312..430293d3f 100644 --- a/ansible/inventory/group_vars/all/openstack +++ b/ansible/inventory/group_vars/all/openstack @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "2026.1". -openstack_release: "2026.1" +# Name of the current OpenStack release. Default is "master". +openstack_release: "master" -# Name of the current OpenStack branch. Default is "stable/2026.1". +# Name of the current OpenStack branch. Default is "master". openstack_branch: >- {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 94269f959..52f686684 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -86,6 +86,82 @@ and tasks. Using tags is not tested in either Kayobe or Kolla-Ansible CI, and as such should only be used if you know what you're doing. Proceed with caution. +Kolla Ansible Playbook +---------------------- + +Some commands that invoke Kolla Ansible support replacing the default +``site.yml`` playbook with a custom one via ``--kolla-playbook``. This may be +used to specify a playbook that replaces or extends the default playbook, and +needs to execute in the Kolla Ansible context. For example:: + + (kayobe) $ kayobe overcloud service deploy --kolla-playbook /path/to/playbook.yml + +The playbook can be called multiple times with different ``kolla_action`` values. You must make the playbook resistant to this, for example by using the ``kolla_action`` variable to conditionally execute tasks. Examples of kolla_action values include: + +- ``backup`` +- ``bootstrap-servers`` +- ``check`` +- ``certificates`` +- ``config`` +- ``config_validate`` +- ``deploy`` +- ``deploy-containers`` +- ``deploy-servers`` +- ``destroy`` +- ``gather-facts`` +- ``migrate-container-engine`` +- ``nova-libvirt-cleanup`` +- ``octavia-certificates`` +- ``post-deploy`` +- ``precheck`` +- ``prune-images`` +- ``pull`` +- ``rabbitmq-reset-state`` +- ``reconfigure`` +- ``stop`` +- ``upgrade`` + +For example, when running ``kayobe overcloud service deploy`` the playbook will be run with ``kolla_action`` set to + +- ``precheck`` +- ``deploy`` +- ``post-deploy`` + +An example of a task only running against a specific kolla_action value is shown below: + +.. code-block:: yaml + + --- + - name: Example custom playbook with precheck and deploy tasks + hosts: all + tasks: + - name: Assert something during precheck + assert: + that: + - some_variable is defined + when: kolla_action == 'precheck' + + - name: Do something during deploy + debug: + msg: "This will only run during deploy" + when: kolla_action == 'deploy' + +Alternatively, you can make the playbook exit if the kolla_action value is not one that the playbook is designed to handle, removing the need for ``when`` conditions on individual tasks: + +.. code-block:: yaml + + --- + - name: Example guarded custom playbook + hosts: all + tasks: + - name: End play if not deploying + meta: end_play + when: kolla_action != 'deploy' + + - name: Do something during deploy + debug: + msg: "This will only run during deploy" + Check and diff mode ------------------- diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 688b6f4c0..1acfd0756 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "2026.1". +# Name of the current OpenStack release. Default is "master". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2026.1". +# Name of the current OpenStack branch. Default is "master". #openstack_branch: ############################################################################### diff --git a/releasenotes/source/2026.1.rst b/releasenotes/source/2026.1.rst new file mode 100644 index 000000000..3d2861580 --- /dev/null +++ b/releasenotes/source/2026.1.rst @@ -0,0 +1,6 @@ +=========================== +2026.1 Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/2026.1 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 6cd206129..4b784937a 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ Kayobe Release Notes :maxdepth: 1 unreleased + 2026.1 2025.2 2025.1 2024.2 diff --git a/requirements.yml b/requirements.yml index 6cdba6264..d96920de6 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: https://opendev.org/openstack/ansible-collection-kolla type: git - version: stable/2026.1 + version: master - name: community.docker version: 5.2.0 - name: community.network diff --git a/tox.ini b/tox.ini index 6f173d62d..86f549130 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ setenv = OS_TEST_TIMEOUT=60 ANSIBLE_VERBOSITY=3 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2026.1} + -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} @@ -42,7 +42,7 @@ commands = [testenv:venv] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2026.1} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -60,7 +60,7 @@ commands = [testenv:molecule] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2026.1} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/molecule-requirements.txt commands = @@ -130,7 +130,7 @@ commands = [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2026.1} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build/html diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2b889a470..2687d1be0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -71,19 +71,11 @@ required-projects: # Include kayobe to ensure other projects can use this job. - name: openstack/ansible-collection-kolla - # TODO(wszumski): Remove when kayobe stable/2026.1 exists. - override-checkout: stable/2026.1 - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla - # TODO(wszumski): Remove when kayobe stable/2026.1 exists. - override-checkout: stable/2026.1 - name: openstack/kolla-ansible - # TODO(wszumski): Remove when kayobe stable/2026.1 exists. - override-checkout: stable/2026.1 - name: openstack/requirements - # TODO(wszumski): Remove when kayobe stable/2026.1 exists. - override-checkout: stable/2026.1 - name: openstack/tenks irrelevant-files: - ^\..+ diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6a8217146..b10876f99 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -29,16 +29,12 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - - kayobe-overcloud-upgrade-slurp-rocky10 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky10 - kayobe-seed-rocky10-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky10 - - kayobe-seed-upgrade-slurp-rocky10 - - kayobe-seed-upgrade-slurp-ubuntu-noble - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble @@ -62,16 +58,12 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky10 - - kayobe-overcloud-upgrade-slurp-rocky10 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky10 - kayobe-seed-rocky10-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky10 - - kayobe-seed-upgrade-slurp-rocky10 - - kayobe-seed-upgrade-slurp-ubuntu-noble - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-ubuntu-noble