From 63405a47288f99b515cc6875c19c45c5fbe9fa8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Mon, 19 Apr 2021 11:08:47 +0200
Subject: [PATCH] Tidy up Wallaby renos
Change-Id: Idad2d4f8bf5f54c57d2c5fccbf6eff7d54f040dd
---
...orter-scrape-timeout-af5dcd5d988ae12b.yaml | 5 ++--
...upport_on_cloudkitty-774e13e363e15a4b.yaml | 25 ++++++++++---------
...m-grafana-dashboards-fd4c8a00cd2dd126.yaml | 5 ++--
...-log-metrics-service-d558015f1cf426df.yaml | 2 +-
.../notes/external-tls-72d36e8aa0b6ccaf.yaml | 4 +--
...ealthchecks-for-aodh-1ddc44642c39b765.yaml | 6 -----
...hchecks-for-barbican-8cccb703a7c8d674.yaml | 6 -----
...lthchecks-for-blazar-88fb90398a249e18.yaml | 6 -----
...lthchecks-for-cinder-518d4d6457703b7e.yaml | 6 -----
...hecks-for-cloudkitty-a032d6408b7eea26.yaml | 6 -----
...lthchecks-for-cyborg-a4b6edb97a09cce5.yaml | 6 -----
...checks-for-designate-f4851e1d6245b0f7.yaml | 6 -----
...ks-for-elasticsearch-b251cd701d428a18.yaml | 6 -----
...thchecks-for-gnocchi-fa2fa16bcdcc0667.yaml | 6 -----
...thchecks-for-haproxy-e222d45809a1a9a1.yaml | 6 -----
...lthchecks-for-ironic-26df3f8c96ab70c7.yaml | 6 -----
...lthchecks-for-kibana-4aff69122b158c00.yaml | 6 -----
...lthchecks-for-magnum-0e92b0645fcdeb61.yaml | 6 -----
...lthchecks-for-manila-a0cd7d075a816ba5.yaml | 6 -----
...thchecks-for-octavia-add6a52fad7a09b9.yaml | 6 -----
...althchecks-for-redis-12f8d528d1b8c0cb.yaml | 6 -----
...lthchecks-for-sahara-d04dce89744e2819.yaml | 6 -----
...lthchecks-for-senlin-c46a3b39a846c597.yaml | 6 -----
...thchecks-for-skydive-a3063822a68205b1.yaml | 6 -----
...lthchecks-for-tacker-aa8a2b2180d57a90.yaml | 6 -----
...althchecks-for-trove-7920c841f784b2e1.yaml | 6 -----
...thchecks-for-vitrage-e2866c51c4b8fb78.yaml | 6 -----
...thchecks-for-watcher-e008d9ca79bfa048.yaml | 6 -----
...ealthchecks-multiple-1ddc44642c39b765.yaml | 10 ++++++++
...ral-clusters-at-once-110057a091600d2c.yaml | 10 ++++----
.../octavia-api-wsgi-cafa913364cb491c.yaml | 2 +-
...remove-cinder-v2-api-64cd9971ca24902c.yaml | 8 +++---
...ve-ml2-agents-config-3f7d49b1e28190fd.yaml | 6 ++---
33 files changed, 45 insertions(+), 170 deletions(-)
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-aodh-1ddc44642c39b765.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-barbican-8cccb703a7c8d674.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-blazar-88fb90398a249e18.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-cinder-518d4d6457703b7e.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-cloudkitty-a032d6408b7eea26.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-cyborg-a4b6edb97a09cce5.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-designate-f4851e1d6245b0f7.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-elasticsearch-b251cd701d428a18.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-gnocchi-fa2fa16bcdcc0667.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-haproxy-e222d45809a1a9a1.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-ironic-26df3f8c96ab70c7.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-kibana-4aff69122b158c00.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-magnum-0e92b0645fcdeb61.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-manila-a0cd7d075a816ba5.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-octavia-add6a52fad7a09b9.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-redis-12f8d528d1b8c0cb.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-sahara-d04dce89744e2819.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-senlin-c46a3b39a846c597.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-tacker-aa8a2b2180d57a90.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-trove-7920c841f784b2e1.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-vitrage-e2866c51c4b8fb78.yaml
delete mode 100644 releasenotes/notes/implement-docker-healthchecks-for-watcher-e008d9ca79bfa048.yaml
create mode 100644 releasenotes/notes/implement-docker-healthchecks-multiple-1ddc44642c39b765.yaml
diff --git a/releasenotes/notes/add-openstack-exporter-scrape-timeout-af5dcd5d988ae12b.yaml b/releasenotes/notes/add-openstack-exporter-scrape-timeout-af5dcd5d988ae12b.yaml
index 1e434a9d39..c037b41e90 100644
--- a/releasenotes/notes/add-openstack-exporter-scrape-timeout-af5dcd5d988ae12b.yaml
+++ b/releasenotes/notes/add-openstack-exporter-scrape-timeout-af5dcd5d988ae12b.yaml
@@ -1,4 +1,5 @@
---
features:
- - Add new option prometheus_openstack_exporter_timeout to override default
- scrape_timeout for openstack exporter job.
+ - |
+ Add new option ``prometheus_openstack_exporter_timeout`` to override
+ default ``scrape_timeout`` for openstack exporter job.
diff --git a/releasenotes/notes/add_elasticsearch_and_prometheus_support_on_cloudkitty-774e13e363e15a4b.yaml b/releasenotes/notes/add_elasticsearch_and_prometheus_support_on_cloudkitty-774e13e363e15a4b.yaml
index 9d5686b95d..0e761c7b6b 100644
--- a/releasenotes/notes/add_elasticsearch_and_prometheus_support_on_cloudkitty-774e13e363e15a4b.yaml
+++ b/releasenotes/notes/add_elasticsearch_and_prometheus_support_on_cloudkitty-774e13e363e15a4b.yaml
@@ -1,17 +1,18 @@
---
features:
- |
- Adds support for elasticsearch storage backend with cloudkitty:
- That feature let you store cloudkitty rating documents directly within
- your elasticsearch cluster.
+ Adds support for Elasticsearch storage backend with Cloudkitty:
+ This feature allows for storage of Cloudkitty rating documents directly
+ within an Elasticsearch cluster.
- If you already have an elasticsearch cluster running for logging it create
- a new cloudkitty specific index. That let you use kibana, grafana or any
- other interface to browse your rating data and create appropriate
- dashboard or build an appropriate billing service over it.
+ If you already have an Elasticsearch cluster running for logging a new
+ cloudkitty specific index will be used. This allows you to use Kibana,
+ Grafana or another interface to browse your rating data and create
+ an appropriate dashboard or build an appropriate billing service over it.
- Adds support for prometheus as a fetcher/collector for cloudkitty:
- That feature let you use prometheus metrics as your source of rating.
- Using prometheus let you rate pretty much any openstack object directly
- from the kolla provided exporters (Openstack_exporter) or your own
- customs exporters.
+ - |
+ Adds support for Prometheus as a fetcher/collector for Cloudkitty:
+ This feature allows for use of Prometheus metrics as your source of rating.
+ Using Prometheus allows for rating almost any OpenStack object directly
+ from the Kolla provided exporters (openstack_exporter) or your own
+ custom exporters.
diff --git a/releasenotes/notes/custom-grafana-dashboards-fd4c8a00cd2dd126.yaml b/releasenotes/notes/custom-grafana-dashboards-fd4c8a00cd2dd126.yaml
index 74594e64c1..d7607f65ce 100644
--- a/releasenotes/notes/custom-grafana-dashboards-fd4c8a00cd2dd126.yaml
+++ b/releasenotes/notes/custom-grafana-dashboards-fd4c8a00cd2dd126.yaml
@@ -1,6 +1,5 @@
---
features:
- |
- Adds support to import custom ``grafana`` dashboards. Dashboard's JSON
- files should be placed into "{{ node_custom_config }}/grafana/dashboards/"
- folder.
+ Adds support to import custom Grafana dashboards. The dashboard JSON files
+ should be placed into ``{{ node_custom_config }}/grafana/dashboards/``.
diff --git a/releasenotes/notes/deprecate-monasca-log-metrics-service-d558015f1cf426df.yaml b/releasenotes/notes/deprecate-monasca-log-metrics-service-d558015f1cf426df.yaml
index 7ef0b0b318..6bce86b47b 100644
--- a/releasenotes/notes/deprecate-monasca-log-metrics-service-d558015f1cf426df.yaml
+++ b/releasenotes/notes/deprecate-monasca-log-metrics-service-d558015f1cf426df.yaml
@@ -3,7 +3,7 @@ upgrade:
- |
The Monasca Log Metrics service has been deprecated and is now
disabled by default. If you wish to enable it, you can set
- `monasca_enable_log_metrics_service` to `True` in `globals.yml`.
+ ``monasca_enable_log_metrics_service`` to ``True`` in ``globals.yml``.
deprecations:
- |
The Monasca Log Metrics service has been deprecated and will be
diff --git a/releasenotes/notes/external-tls-72d36e8aa0b6ccaf.yaml b/releasenotes/notes/external-tls-72d36e8aa0b6ccaf.yaml
index 2a80aceea2..d22dd220ff 100644
--- a/releasenotes/notes/external-tls-72d36e8aa0b6ccaf.yaml
+++ b/releasenotes/notes/external-tls-72d36e8aa0b6ccaf.yaml
@@ -1,5 +1,5 @@
---
features:
- |
- Add `kolla_externally_managed_cert` option to disable copy of certificates
- from the operator host to kolla-ansible managed hosts.
+ Add ``kolla_externally_managed_cert`` option to disable copy of
+ certificates from the operator host to Kolla Ansible managed hosts.
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-aodh-1ddc44642c39b765.yaml b/releasenotes/notes/implement-docker-healthchecks-for-aodh-1ddc44642c39b765.yaml
deleted file mode 100644
index 524f0507c6..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-aodh-1ddc44642c39b765.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for aodh services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-barbican-8cccb703a7c8d674.yaml b/releasenotes/notes/implement-docker-healthchecks-for-barbican-8cccb703a7c8d674.yaml
deleted file mode 100644
index bd4b64c976..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-barbican-8cccb703a7c8d674.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for barbican services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-blazar-88fb90398a249e18.yaml b/releasenotes/notes/implement-docker-healthchecks-for-blazar-88fb90398a249e18.yaml
deleted file mode 100644
index 60d765d266..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-blazar-88fb90398a249e18.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for blazar services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-cinder-518d4d6457703b7e.yaml b/releasenotes/notes/implement-docker-healthchecks-for-cinder-518d4d6457703b7e.yaml
deleted file mode 100644
index e425db8e5b..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-cinder-518d4d6457703b7e.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for cinder services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-cloudkitty-a032d6408b7eea26.yaml b/releasenotes/notes/implement-docker-healthchecks-for-cloudkitty-a032d6408b7eea26.yaml
deleted file mode 100644
index f7b88dded4..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-cloudkitty-a032d6408b7eea26.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for cloudkitty services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-cyborg-a4b6edb97a09cce5.yaml b/releasenotes/notes/implement-docker-healthchecks-for-cyborg-a4b6edb97a09cce5.yaml
deleted file mode 100644
index af5767b83b..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-cyborg-a4b6edb97a09cce5.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for cyborg services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-designate-f4851e1d6245b0f7.yaml b/releasenotes/notes/implement-docker-healthchecks-for-designate-f4851e1d6245b0f7.yaml
deleted file mode 100644
index 1f7a584db9..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-designate-f4851e1d6245b0f7.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for designate services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-elasticsearch-b251cd701d428a18.yaml b/releasenotes/notes/implement-docker-healthchecks-for-elasticsearch-b251cd701d428a18.yaml
deleted file mode 100644
index d0f508f3e9..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-elasticsearch-b251cd701d428a18.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for elasticsearch services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-gnocchi-fa2fa16bcdcc0667.yaml b/releasenotes/notes/implement-docker-healthchecks-for-gnocchi-fa2fa16bcdcc0667.yaml
deleted file mode 100644
index 1b5ff6e880..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-gnocchi-fa2fa16bcdcc0667.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for gnocchi services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-haproxy-e222d45809a1a9a1.yaml b/releasenotes/notes/implement-docker-healthchecks-for-haproxy-e222d45809a1a9a1.yaml
deleted file mode 100644
index 9607fffcd4..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-haproxy-e222d45809a1a9a1.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for haproxy services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-ironic-26df3f8c96ab70c7.yaml b/releasenotes/notes/implement-docker-healthchecks-for-ironic-26df3f8c96ab70c7.yaml
deleted file mode 100644
index 394346551d..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-ironic-26df3f8c96ab70c7.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for ironic services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-kibana-4aff69122b158c00.yaml b/releasenotes/notes/implement-docker-healthchecks-for-kibana-4aff69122b158c00.yaml
deleted file mode 100644
index 8ca28c53cd..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-kibana-4aff69122b158c00.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for kibana services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-magnum-0e92b0645fcdeb61.yaml b/releasenotes/notes/implement-docker-healthchecks-for-magnum-0e92b0645fcdeb61.yaml
deleted file mode 100644
index 2e72d7e67e..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-magnum-0e92b0645fcdeb61.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for magnum services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-manila-a0cd7d075a816ba5.yaml b/releasenotes/notes/implement-docker-healthchecks-for-manila-a0cd7d075a816ba5.yaml
deleted file mode 100644
index 48f12e3ea1..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-manila-a0cd7d075a816ba5.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for manila services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-octavia-add6a52fad7a09b9.yaml b/releasenotes/notes/implement-docker-healthchecks-for-octavia-add6a52fad7a09b9.yaml
deleted file mode 100644
index bff099f6b3..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-octavia-add6a52fad7a09b9.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for octavia services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-redis-12f8d528d1b8c0cb.yaml b/releasenotes/notes/implement-docker-healthchecks-for-redis-12f8d528d1b8c0cb.yaml
deleted file mode 100644
index 089a963267..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-redis-12f8d528d1b8c0cb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for redis services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-sahara-d04dce89744e2819.yaml b/releasenotes/notes/implement-docker-healthchecks-for-sahara-d04dce89744e2819.yaml
deleted file mode 100644
index 84897c2a94..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-sahara-d04dce89744e2819.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for sahara services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-senlin-c46a3b39a846c597.yaml b/releasenotes/notes/implement-docker-healthchecks-for-senlin-c46a3b39a846c597.yaml
deleted file mode 100644
index cb7bcb5280..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-senlin-c46a3b39a846c597.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for senlin services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml b/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml
deleted file mode 100644
index 7f6c67455a..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-skydive-a3063822a68205b1.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for skydive services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-tacker-aa8a2b2180d57a90.yaml b/releasenotes/notes/implement-docker-healthchecks-for-tacker-aa8a2b2180d57a90.yaml
deleted file mode 100644
index 11954ac132..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-tacker-aa8a2b2180d57a90.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for tacker services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-trove-7920c841f784b2e1.yaml b/releasenotes/notes/implement-docker-healthchecks-for-trove-7920c841f784b2e1.yaml
deleted file mode 100644
index ee365ab863..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-trove-7920c841f784b2e1.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for trove services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-vitrage-e2866c51c4b8fb78.yaml b/releasenotes/notes/implement-docker-healthchecks-for-vitrage-e2866c51c4b8fb78.yaml
deleted file mode 100644
index 1eb13b43e9..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-vitrage-e2866c51c4b8fb78.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for vitrage services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-for-watcher-e008d9ca79bfa048.yaml b/releasenotes/notes/implement-docker-healthchecks-for-watcher-e008d9ca79bfa048.yaml
deleted file mode 100644
index 6e9607c978..0000000000
--- a/releasenotes/notes/implement-docker-healthchecks-for-watcher-e008d9ca79bfa048.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-features:
- - |
- Implements container healthchecks for watcher services.
- See `blueprint
- <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/implement-docker-healthchecks-multiple-1ddc44642c39b765.yaml b/releasenotes/notes/implement-docker-healthchecks-multiple-1ddc44642c39b765.yaml
new file mode 100644
index 0000000000..57610839cd
--- /dev/null
+++ b/releasenotes/notes/implement-docker-healthchecks-multiple-1ddc44642c39b765.yaml
@@ -0,0 +1,10 @@
+---
+features:
+ - |
+ Implemented container healthchecks for following services: ``aodh``,
+ ``barbican``, ``blazar``, ``cinder``, ``cloudkitty``, ``cyborg``,
+ ``designate``, ``elasticsearch``, ``gnocchi``, ``haproxy``, ``ironic``,
+ ``kibana``, ``magnum``, ``manila``, ``octavia``, ``redis``, ``sahara``,
+ ``senlin``, ``skydive``, ``tacker``, ``trove``, ``vitrage``, ``watcher``.
+ See `blueprint
+ <https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__
diff --git a/releasenotes/notes/mariadb-role-install-several-clusters-at-once-110057a091600d2c.yaml b/releasenotes/notes/mariadb-role-install-several-clusters-at-once-110057a091600d2c.yaml
index 9da4debc43..ecfd4f9a50 100644
--- a/releasenotes/notes/mariadb-role-install-several-clusters-at-once-110057a091600d2c.yaml
+++ b/releasenotes/notes/mariadb-role-install-several-clusters-at-once-110057a091600d2c.yaml
@@ -1,8 +1,8 @@
---
features:
- |
- The Mariadb role now allows the creation of multiple clusters.
- This provides a benefit to operators as they are able to install
- and maintain several clusters at once using kolla-ansible.
- This is useful when deploying db clusters for cells or db clusters
- for services that have large demands on the database.
+ The Mariadb role now allows the creation of multiple clusters. This
+ provides a benefit to operators as they are able to install and maintain
+ several clusters at once using kolla-ansible. This is useful when
+ deploying database clusters for cells or database clusters for services
+ that have large demands on the database.
diff --git a/releasenotes/notes/octavia-api-wsgi-cafa913364cb491c.yaml b/releasenotes/notes/octavia-api-wsgi-cafa913364cb491c.yaml
index 371c1f30c4..38ac265e7c 100644
--- a/releasenotes/notes/octavia-api-wsgi-cafa913364cb491c.yaml
+++ b/releasenotes/notes/octavia-api-wsgi-cafa913364cb491c.yaml
@@ -1,7 +1,7 @@
---
features:
- |
- Switch octavia-api to wsgi running under apache.
+ Switch ``octavia-api`` to WSGI running under Apache.
- |
Added configuration options to enable backend TLS encryption from HAProxy
to the Octavia service. When used in conjunction with enabling TLS for
diff --git a/releasenotes/notes/remove-cinder-v2-api-64cd9971ca24902c.yaml b/releasenotes/notes/remove-cinder-v2-api-64cd9971ca24902c.yaml
index 85764fd917..4d44948616 100644
--- a/releasenotes/notes/remove-cinder-v2-api-64cd9971ca24902c.yaml
+++ b/releasenotes/notes/remove-cinder-v2-api-64cd9971ca24902c.yaml
@@ -1,6 +1,8 @@
---
-deprecations:
+upgrade:
- |
- cinder v2 api is not supported in wallaby, and we remove it
- from kolla project. See `API v2 support removed in Wallaby
+ Removes support for Cinder v2 API. This API was planned for removal from
+ Cinder in the Wallaby release but has been postposed until Xena. Cinder v2
+ API endpoints are removed from the Keystone endpoint catalogue on upgrade.
+ `API v2 support removed in Wallaby
<http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018697.html>`__
diff --git a/releasenotes/notes/remove-ml2-agents-config-3f7d49b1e28190fd.yaml b/releasenotes/notes/remove-ml2-agents-config-3f7d49b1e28190fd.yaml
index 3801f57268..f95003b68b 100644
--- a/releasenotes/notes/remove-ml2-agents-config-3f7d49b1e28190fd.yaml
+++ b/releasenotes/notes/remove-ml2-agents-config-3f7d49b1e28190fd.yaml
@@ -2,6 +2,6 @@
upgrade:
- |
Customizing Neutron Linux bridge and Open vSwitch Agents config via
- ml2_conf.ini is removed. The config has been split out for these
- agents into linuxbridge_agent.ini and openvswitch_agent.ini respectively.
- The old behaviour was deprecated in Ussuri for removal in Victoria.
+ ``ml2_conf.ini`` is removed. The config has been split out for these
+ agents into ``linuxbridge_agent.ini`` and ``openvswitch_agent.ini``
+ respectively. The old behaviour was deprecated in Ussuri.