From 1306251b5feca29240677c8fd1d4acd8f20b103b Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 5 Feb 2018 18:04:14 -0800
Subject: [PATCH] Release Octavia projects for Queens RC1

Note: This patch adds a cycle-highlight to previously released
python-octaviaclient.

Change-Id: I81dd5da89a3ed4fd0d8075a199e6f90e75a31528
---
 deliverables/queens/neutron-lbaas-dashboard.yaml |  7 +++++++
 deliverables/queens/neutron-lbaas.yaml           | 13 +++++++++++++
 deliverables/queens/octavia-dashboard.yaml       | 12 ++++++++++++
 deliverables/queens/octavia.yaml                 | 13 +++++++++++++
 deliverables/queens/python-octaviaclient.yaml    |  4 ++++
 5 files changed, 49 insertions(+)

diff --git a/deliverables/queens/neutron-lbaas-dashboard.yaml b/deliverables/queens/neutron-lbaas-dashboard.yaml
index 68186f59fa..b024c7cac1 100644
--- a/deliverables/queens/neutron-lbaas-dashboard.yaml
+++ b/deliverables/queens/neutron-lbaas-dashboard.yaml
@@ -18,5 +18,12 @@ releases:
       - hash: 6777fdc3a290fc159d4ff93b556f506ed8cb32ee
         repo: openstack/neutron-lbaas-dashboard
     version: 4.0.0.0b3
+  - projects:
+      - hash: c56d3f3e2254d752cae05dbc728ab354eae101fd
+        repo: openstack/neutron-lbaas-dashboard
+    version: 4.0.0.0rc1
+branches:
+  - location: 4.0.0.0rc1
+    name: stable/queens
 repository-settings:
   openstack/neutron-lbaas-dashboard: {}
diff --git a/deliverables/queens/neutron-lbaas.yaml b/deliverables/queens/neutron-lbaas.yaml
index a74357e88d..87a7641204 100644
--- a/deliverables/queens/neutron-lbaas.yaml
+++ b/deliverables/queens/neutron-lbaas.yaml
@@ -18,5 +18,18 @@ releases:
       - hash: d024d4262f3474ea211bc572776ea812b5643420
         repo: openstack/neutron-lbaas
     version: 12.0.0.0b3
+  - projects:
+      - hash: 4cf67c4898ba104c430a6c0da4b5e13801e6722e
+        repo: openstack/neutron-lbaas
+    version: 12.0.0.0rc1
+branches:
+  - location: 12.0.0.0rc1
+    name: stable/queens
+cycle-highlights:
+  - The neutron-lbaas and neutron-lbaas-dashboard projects are now deprecated.
+    Please see the FAQ at
+    https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
+  - Neutron-lbaas now includes a proxy plugin that forwards all API requests
+    to the Octavia API.
 repository-settings:
   openstack/neutron-lbaas: {}
diff --git a/deliverables/queens/octavia-dashboard.yaml b/deliverables/queens/octavia-dashboard.yaml
index 288ded32b3..dea91ef4f2 100644
--- a/deliverables/queens/octavia-dashboard.yaml
+++ b/deliverables/queens/octavia-dashboard.yaml
@@ -2,6 +2,7 @@
 include-pypi-link: yes
 storyboard: 909
 release-model: cycle-with-milestones
+release-notes: https://docs.openstack.org/releasenotes/octavia-dashboard/unreleased.html
 release-type: horizon
 team: octavia
 type: horizon-plugin
@@ -18,5 +19,16 @@ releases:
       - hash: 6407785f3c01586cceda760934cd088873253b86
         repo: openstack/octavia-dashboard
     version: 1.0.0.0b3
+  - projects:
+      - hash: eff100522a7ad5904db95468199489656c894727
+        repo: openstack/octavia-dashboard
+    version: 1.0.0.0rc1
+branches:
+  - location: 1.0.0.0rc1
+    name: stable/queens
+cycle-highlights:
+  - The initial release of the Octavia dashboard for Horizon includes
+    significantly improved load balancer detail pages and workflows compared
+    to the, now deprecated, neutron-lbaas-dashboard.
 repository-settings:
   openstack/octavia-dashboard: {}
diff --git a/deliverables/queens/octavia.yaml b/deliverables/queens/octavia.yaml
index 179fa23881..6456858e3a 100644
--- a/deliverables/queens/octavia.yaml
+++ b/deliverables/queens/octavia.yaml
@@ -19,5 +19,18 @@ releases:
       - hash: 205a5b7be315e0843a220f962afd1c415fea1fd1
         repo: openstack/octavia
     version: 2.0.0.0b3
+  - projects:
+      - hash: 0146961653f5f09f32d7186c6c7d67cddc7627c0
+        repo: openstack/octavia
+    version: 2.0.0.0rc1
+branches:
+  - location: 2.0.0.0rc1
+    name: stable/queens
+cycle-highlights:
+  - Added the ability to batch update pool members.
+  - A Neutron Quality of Service (QoS) policy can now be applied to Octavia
+    load balancers.
+  - Octavia now supports using Castellan and PKCS12 bundles for TLS
+    termination.
 repository-settings:
   openstack/octavia: {}
diff --git a/deliverables/queens/python-octaviaclient.yaml b/deliverables/queens/python-octaviaclient.yaml
index 575a00135c..01f91e49a7 100644
--- a/deliverables/queens/python-octaviaclient.yaml
+++ b/deliverables/queens/python-octaviaclient.yaml
@@ -17,5 +17,9 @@ releases:
     projects:
       - repo: openstack/python-octaviaclient
         hash: 830e49fb0528718e8c6cea0e0828248849044133
+cycle-highlights:
+  - The Octavia OpenStack client plugin now supports quotas, load balancer QoS
+    policies, load balancer failover, listener statistics, and filtering by
+    load balancer ID.
 repository-settings:
   openstack/python-octaviaclient: {}