From 20df524b40ac82ea69672000ca15e7930e613ecd Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 10 Jul 2020 18:37:03 +0100
Subject: [PATCH] Release kolla stable branches

* kolla 8.0.4 (stein)
* kolla-ansible 8.2.0 (stein)
* kolla 9.2.0 (train)
* kolla-ansible 9.2.0 (train)
* kayobe 7.1.0 (train)
* kolla 10.1.0 (ussuri)
* kolla-ansible 10.1.0 (ussuri)

Change-Id: Icd96b8b80c7ca50e9e7416288a611e553823a1cb
---
 deliverables/stein/kolla-ansible.yaml  | 4 ++++
 deliverables/stein/kolla.yaml          | 4 ++++
 deliverables/train/kayobe.yaml         | 8 ++++++++
 deliverables/train/kolla-ansible.yaml  | 4 ++++
 deliverables/train/kolla.yaml          | 4 ++++
 deliverables/ussuri/kolla-ansible.yaml | 4 ++++
 deliverables/ussuri/kolla.yaml         | 4 ++++
 7 files changed, 32 insertions(+)

diff --git a/deliverables/stein/kolla-ansible.yaml b/deliverables/stein/kolla-ansible.yaml
index 2dc5a1e897..7f8552100c 100644
--- a/deliverables/stein/kolla-ansible.yaml
+++ b/deliverables/stein/kolla-ansible.yaml
@@ -38,4 +38,8 @@ releases:
     projects:
       - hash: 5cbbea90bac35fd1ce72ec7a1203c51d4bf04ddf
         repo: openstack/kolla-ansible
+  - version: 8.2.0
+    projects:
+      - repo: openstack/kolla-ansible
+        hash: a96ca60658b597ac0b2a04f05bb87f0ed6fd2c55
 release-notes: https://docs.openstack.org/releasenotes/kolla-ansible/stein.html
diff --git a/deliverables/stein/kolla.yaml b/deliverables/stein/kolla.yaml
index e320d82f73..681ebae314 100644
--- a/deliverables/stein/kolla.yaml
+++ b/deliverables/stein/kolla.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/kolla
         hash: 0cf37e0091bf51f169436cfb1c4290de892042aa
+  - version: 8.0.4
+    projects:
+      - repo: openstack/kolla
+        hash: 7038e3ff03c6d08e7b794f9087675964ddbbed0a
 cycle-highlights:
   - Completed addition of images and playbooks for the OpenStack Monitoring
     service, Monasca.
diff --git a/deliverables/train/kayobe.yaml b/deliverables/train/kayobe.yaml
index f93a69e84f..a4347f974d 100644
--- a/deliverables/train/kayobe.yaml
+++ b/deliverables/train/kayobe.yaml
@@ -39,4 +39,12 @@ releases:
         hash: 1c5fa6329344c8c25951f9d56897196c3327b27b
       - repo: openstack/kayobe-config-dev
         hash: 9ad705ff57828da832047a0174a33bff4aef16e7
+  - version: 7.1.0
+    projects:
+      - repo: openstack/kayobe
+        hash: 3c32015baa54c6575d1d09e9bfc63679e00a2fb2
+      - repo: openstack/kayobe-config
+        hash: 6b0e952742bc50d45433464a3b1a0bf7201ec623
+      - repo: openstack/kayobe-config-dev
+        hash: d87b3ebf7c31abfe4824214657e96883be6b5307
 release-notes: https://docs.openstack.org/releasenotes/kayobe/train.html
diff --git a/deliverables/train/kolla-ansible.yaml b/deliverables/train/kolla-ansible.yaml
index 5c51249c77..029f804b4d 100644
--- a/deliverables/train/kolla-ansible.yaml
+++ b/deliverables/train/kolla-ansible.yaml
@@ -33,4 +33,8 @@ releases:
       - repo: openstack/kolla-ansible
         hash: e224a45d4004c9d7e98af73b2576c5a0ff2b26f7
     version: 9.1.0
+  - version: 9.2.0
+    projects:
+      - repo: openstack/kolla-ansible
+        hash: 1629f5fe082d2a592d2b3bcf18fe98139cadce46
 release-notes: https://docs.openstack.org/releasenotes/kolla-ansible/train.html
diff --git a/deliverables/train/kolla.yaml b/deliverables/train/kolla.yaml
index ace908991a..fc856595e1 100644
--- a/deliverables/train/kolla.yaml
+++ b/deliverables/train/kolla.yaml
@@ -33,6 +33,10 @@ releases:
     projects:
       - repo: openstack/kolla
         hash: 47df05074204b87805986c7e9ae6743e3dce28db
+  - version: 9.2.0
+    projects:
+      - repo: openstack/kolla
+        hash: 0e6465543e4ae91c9b791944444e72905a716a6d
 cycle-highlights:
   - Switched to Python 3 in Debian and Ubuntu source images.
   - Introduced images and playbooks for Masakari, which supports instance
diff --git a/deliverables/ussuri/kolla-ansible.yaml b/deliverables/ussuri/kolla-ansible.yaml
index 11d3cab579..95cad2ac8a 100644
--- a/deliverables/ussuri/kolla-ansible.yaml
+++ b/deliverables/ussuri/kolla-ansible.yaml
@@ -18,6 +18,10 @@ releases:
     projects:
       - repo: openstack/kolla-ansible
         hash: 55eac5947d091e24d59fa434cf54a89b232633d9
+  - version: 10.1.0
+    projects:
+      - repo: openstack/kolla-ansible
+        hash: 6bba8cc52af3a26678da48129856f80c21eb8e38
 branches:
   - name: stable/ussuri
     location: 10.0.0.0rc1
diff --git a/deliverables/ussuri/kolla.yaml b/deliverables/ussuri/kolla.yaml
index e885f9e581..85f57631ec 100644
--- a/deliverables/ussuri/kolla.yaml
+++ b/deliverables/ussuri/kolla.yaml
@@ -38,6 +38,10 @@ releases:
     projects:
       - repo: openstack/kolla
         hash: 4103b0b151af100493c7242b088b42f051bf5485
+  - version: 10.1.0
+    projects:
+      - repo: openstack/kolla
+        hash: fbea3bf26d93e6fd784dbd9967659f549df3ec2d
 branches:
   - name: stable/ussuri
     location: 10.0.0.0rc1