From e6dfc3411f0cfdd67e6f89e191e220638de7f7e5 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Thu, 21 Mar 2024 15:18:52 +0100 Subject: [PATCH 1/2] Update kolla-ansible to fix crash related to Docker API change --- enos/services/kolla.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/enos/services/kolla.py b/enos/services/kolla.py index dd39b09..8ed3396 100644 --- a/enos/services/kolla.py +++ b/enos/services/kolla.py @@ -15,8 +15,12 @@ from ansible.plugins.loader import filter_loader as ansible_filter_loader from enos.utils import constants as C -# Default kolla-ansible package to install (OpenStack Wallaby) -KOLLA_PKG = 'kolla-ansible~=12.0' +# Default kolla-ansible package to install (version 12 for OpenStack Wallaby) +# We need recent fix https://review.opendev.org/c/openstack/kolla-ansible/+/872558 +# Unfortunately there are no recent releases of kolla-ansible 12 and even the +# stable branch stable/wallaby has disappeared. +kolla_commit_id = '6bc5dfc35117c90b8d2f9d96921286249b99a222' +KOLLA_PKG = f'git+https://github.com/openstack/kolla-ansible.git@{kolla_commit_id}' # Kolla recommends installing ansible manually. Currently 2.9 is supported. # Refers to the kolla-ansible User Guides for future versions. See, From 57761550edcace47cfecb075c21cf102011c2ce6 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Thu, 21 Mar 2024 15:19:03 +0100 Subject: [PATCH 2/2] Update customization example --- docs/customization/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customization/index.rst b/docs/customization/index.rst index a9b5291..68cd06f 100644 --- a/docs/customization/index.rst +++ b/docs/customization/index.rst @@ -14,7 +14,7 @@ values: .. code-block:: yaml - kolla-ansible: kolla-ansible~=10.0 + kolla-ansible: kolla-ansible~=12.0 * a git repository to the Ussuri specific version of OpenStack