From f5e5000d86485c9e8591e2269f85669eb2c6eb31 Mon Sep 17 00:00:00 2001
From: Paul Browne <pfb29@cam.ac.uk>
Date: Mon, 27 Jul 2020 19:59:31 +0000
Subject: [PATCH] Upstream branches were merged, so use the stable Train
branches again for Kolla/Kolla-Ansible
---
etc/kayobe/kolla.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index ee671fd40..6d41b9548 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -15,7 +15,7 @@ kolla_source_url: https://github.com/RSE-Cambridge/kolla
# Version (branch, tag, etc.) of Kolla source code repository if type is
# 'source'. Default is {{ openstack_branch }}.
-kolla_source_version: train_sync_20200520
+kolla_source_version: cumulus/train
# Path to virtualenv in which to install kolla.
#kolla_venv:
@@ -39,7 +39,7 @@ kolla_ansible_source_url: https://github.com/RSE-Cambridge/kolla-ansible
# Version (branch, tag, etc.) of Kolla Ansible source code repository if type
# is 'source'. Default is {{ openstack_branch }}.
-kolla_ansible_source_version: train-sync-20200520
+kolla_ansible_source_version: cumulus/train
# Path to virtualenv in which to install kolla-ansible. Default is
# $KOLLA_VENV_PATH or $PWD/venvs/kolla-ansible if $KOLLA_VENV_PATH is not set.
--
GitLab