openstack/kayobe
Code Issues Proposed changes

Revert "Use OpenStack Wallaby release"

Browse Source 
This reverts commit 3f76d7d134.

The version of IPA images has been pinned to wallaby to ensure they are
compatible with the Wallaby Ironic in current Kolla master images.
Without this, bare metal tests fail with

    'Not found: Extension with id iscsi not found.'

Ironic removed the iscsi driver in Xena.

Change-Id: Ia4c70965d9f3f099046591bac7f702ee982fef71
This commit is contained in:
Mark Goddard 2021-05-17 16:17:27 +01:00
parent 091a262908
commit 1dc6d98be7
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/group_vars/all/ipa
View File

@ -88,7 +88,9 @@ ipa_build_upper_constraints_file: "{{ pip_upper_constraints_file }}"
# Suffix of upstream Ironic deployment image files. Default is based on
# {{ openstack_branch }}.
ipa_images_upstream_url_suffix: "-{{ openstack_branch | replace('/', '-') }}"
#ipa_images_upstream_url_suffix: "-{{ openstack_branch | replace('/', '-') }}"
# TODO(mgoddard): revert to the above when Kolla images contain master/Xena.
ipa_images_upstream_url_suffix: "-stable-wallaby"
# Name of Ironic deployment kernel image to register in Glance.
ipa_images_kernel_name: "ipa.kernel"

6
ansible/group_vars/all/openstack
View File

@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.
# Name of the current OpenStack release. Default is "wallaby".
openstack_release: "wallaby"
# Name of the current OpenStack release. Default is "master".
openstack_release: "master"
# Name of the current OpenStack branch. Default is "stable/wallaby".
# Name of the current OpenStack branch. Default is "master".
openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

4
etc/kayobe/openstack.yml
View File

@ -2,10 +2,10 @@
###############################################################################
# OpenStack release configuration.
# Name of the current OpenStack release. Default is "wallaby".
# Name of the current OpenStack release. Default is "master".
#openstack_release:
# Name of the current OpenStack branch. Default is "stable/wallaby".
# Name of the current OpenStack branch. Default is "master".
#openstack_branch:
###############################################################################

10
tox.ini
View File

@ -19,7 +19,7 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-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}
@ -27,7 +27,7 @@ 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/wallaby}
-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
@ -42,7 +42,7 @@ commands =
[testenv:venv]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-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/wallaby}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals =
@ -109,7 +109,7 @@ commands =
[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build/html

6
zuul.d/jobs.yaml
View File

@ -59,14 +59,8 @@
- name: openstack/kayobe
- name: openstack/kayobe-config-dev
- name: openstack/kolla
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/kolla-ansible
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/requirements
# TODO(mnasiadka): Remove when kayobe stable/wallaby exists.
override-checkout: stable/wallaby
- name: openstack/tenks
irrelevant-files:
- ^.*\.rst$