Merge pull request #366 from BeyondTheClouds/update_kolla_12

Update kolla-ansible to fix Docker-related crash

Author: jonglezb

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
 

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,