From 4a04c9ebed927b38c546eb19ac48cfc73237b3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Trellu?= <gaetan.trellu@incloudus.com>
Date: Thu, 20 Jun 2019 20:21:40 -0400
Subject: [PATCH] Add Kolla integration release note

Qinling as been fully integrated to Kolla, it deserves a
release note :)

Change-Id: I42c3b4d4f45f94f5f344529aae1d6be06be23c7a
---
 .../notes/add-cors-support-ce060ee8513a1acf.yaml  | 15 +++++++++------
 ...inling-kolla-integration-305813d80110f209.yaml | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/qinling-kolla-integration-305813d80110f209.yaml

diff --git a/releasenotes/notes/add-cors-support-ce060ee8513a1acf.yaml b/releasenotes/notes/add-cors-support-ce060ee8513a1acf.yaml
index a3d9e13c..8a6af145 100644
--- a/releasenotes/notes/add-cors-support-ce060ee8513a1acf.yaml
+++ b/releasenotes/notes/add-cors-support-ce060ee8513a1acf.yaml
@@ -1,9 +1,12 @@
 ---
 features:
   - |
-    Add CORS and HTTPProxyToWSGI support based on oslo_middleware in front
-    of the Qinling API. The purpose of this middleware is to set up the
-    request URL correctly in the case there is a proxy (for instance, a
-    loadbalancer such as HAProxy) in front of the Qinling API.
-    The HTTPProxyToWSGI is off by default and needs to be enabled via a
-    configuration value.
+    Add ``CORS``, ``HTTPProxyToWSGI`` and ``WSGI`` support based on
+    ``oslo_middleware`` library in front of the Qinling API.
+
+    The purpose of this middleware is to set up the request URL correctly
+    in the case there is a proxy (for instance, a loadbalancer such as
+    HAProxy) in front of the Qinling API.
+
+    The ``HTTPProxyToWSGI`` option is ``off`` by default and needs to be
+    enabled via a configuration value.
diff --git a/releasenotes/notes/qinling-kolla-integration-305813d80110f209.yaml b/releasenotes/notes/qinling-kolla-integration-305813d80110f209.yaml
new file mode 100644
index 00000000..32df72e6
--- /dev/null
+++ b/releasenotes/notes/qinling-kolla-integration-305813d80110f209.yaml
@@ -0,0 +1,15 @@
+---
+features:
+  - |
+    Qinling is now fully integrated within Kolla (Docker) and Kolla Ansible.
+
+    Qinling features supported by Kolla:
+
+    * Configure an external Kubernetes cluster
+    * Use ``etcd`` from Kolla
+    * Qinling API Apache WSGI deployment
+    * ``CORS`` configuration
+
+    See `Kolla documentation
+    <https://docs.openstack.org/kolla-ansible/latest/reference/compute/qinling-guide.html>`_ for
+    details.