diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack index 0b6c8fd4f..e768d4a5d 100644 --- a/ansible/inventory/group_vars/all/openstack +++ b/ansible/inventory/group_vars/all/openstack @@ -5,9 +5,9 @@ # Name of the current OpenStack release. Default is "2023.1". openstack_release: "2023.1" -# Name of the current OpenStack branch. Default is "stable/2023.1". +# Name of the current OpenStack branch. Default is "unmaintained/2023.1". openstack_branch: >- - {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} + {% if openstack_release != 'master' %}unmaintained/{% endif %}{{ openstack_release | lower }} ############################################################################### # OpenStack authentication configuration. diff --git a/requirements.yml b/requirements.yml index da1f554f7..4590f0c64 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: https://opendev.org/openstack/ansible-collection-kolla type: git - version: stable/2023.1 + version: unmaintained/2023.1 - name: dellemc.os10 version: 1.1.1 - name: stackhpc.linux diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2caf7d615..a65a52962 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(mattcrees): Remove when kayobe stable/2023.1 exists. - override-checkout: stable/2023.1 - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla - # TODO(mattcrees): Remove when kayobe stable/2023.1 exists. - override-checkout: stable/2023.1 - name: openstack/kolla-ansible - # TODO(mattcrees): Remove when kayobe stable/2023.1 exists. - override-checkout: stable/2023.1 - name: openstack/requirements - # TODO(mattcrees): Remove when kayobe stable/2023.1 exists. - override-checkout: stable/2023.1 - name: openstack/tenks irrelevant-files: - ^\..+