From 63e8a47206d6faaf69c18e6f33553f304ae42c2c Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 15 Dec 2022 13:15:44 +0100
Subject: [PATCH] [release] Clean up release notes for Zed release

Release notes about cloud image updates are removed because they refer
to unsupported systems.

Change-Id: I020ca65b2ec1d4be4f6660f9b90be80e952138b0
---
 .../notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml  | 3 ++-
 .../notes/fix-hacluster-variable-48d1370651a11cda.yaml      | 2 +-
 .../notes/install-acl-package-0f21c110cd07537c.yaml         | 6 +++---
 .../notes/inventory-group-vars-cef39cb6f3803ee7.yaml        | 4 ++--
 .../notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml       | 5 -----
 ...upport-ansible-vault-password-file-d00ca1e041e1bd88.yaml | 4 ++--
 ...update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml | 5 -----
 7 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml
 delete mode 100644 releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml

diff --git a/releasenotes/notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml b/releasenotes/notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml
index 4083af8c..89f815a1 100644
--- a/releasenotes/notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml
+++ b/releasenotes/notes/bifrost-dhcp-range-netmask-fd40642967042267.yaml
@@ -2,4 +2,5 @@
 fixes:
   - |
     Ironic inspection through Bifrost now work even if DHCP-relay is used.
-    The dhcp-range in dnsmasq.conf corrctly configured with network mask.
+    The dhcp-range in ``dnsmasq.conf`` is now correctly configured with its
+    network mask.
diff --git a/releasenotes/notes/fix-hacluster-variable-48d1370651a11cda.yaml b/releasenotes/notes/fix-hacluster-variable-48d1370651a11cda.yaml
index 868075ea..7a937683 100644
--- a/releasenotes/notes/fix-hacluster-variable-48d1370651a11cda.yaml
+++ b/releasenotes/notes/fix-hacluster-variable-48d1370651a11cda.yaml
@@ -1,4 +1,4 @@
 ---
 fixes:
   - |
-    Fixes an issue with undefined kolla_enable_hacluster variable.
+    Fixes an issue with undefined ``kolla_enable_hacluster`` variable.
diff --git a/releasenotes/notes/install-acl-package-0f21c110cd07537c.yaml b/releasenotes/notes/install-acl-package-0f21c110cd07537c.yaml
index d67d8f86..ef364279 100644
--- a/releasenotes/notes/install-acl-package-0f21c110cd07537c.yaml
+++ b/releasenotes/notes/install-acl-package-0f21c110cd07537c.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Fixes an issue where a custom playbook using `become_user` could fail when
-    setting permissions on temporary files. The `acl` package is now installed
-    on all systems by default.
+    Fixes an issue where a custom playbook using ``become_user`` could fail
+    when setting permissions on temporary files. The ``acl`` package is now
+    installed on all systems by default.
diff --git a/releasenotes/notes/inventory-group-vars-cef39cb6f3803ee7.yaml b/releasenotes/notes/inventory-group-vars-cef39cb6f3803ee7.yaml
index e43ce030..47089bea 100644
--- a/releasenotes/notes/inventory-group-vars-cef39cb6f3803ee7.yaml
+++ b/releasenotes/notes/inventory-group-vars-cef39cb6f3803ee7.yaml
@@ -13,6 +13,6 @@ upgrade:
        commands, and do not need to be in the same directory as the playbook
        being executed. This means that the `previous workaround
        <https://docs.openstack.org/kayobe/yoga/custom-ansible-playbooks.html#packaging-custom-playbooks-with-configuration>`_
-       for custom playbooks involving symlinking to the group_vars directory
-       from the directory containing the custom playbook is no longer
+       for custom playbooks involving symlinking to the ``group_vars``
+       directory from the directory containing the custom playbook is no longer
        necessary.
diff --git a/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml b/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml
deleted file mode 100644
index 9dce57e0..00000000
--- a/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-upgrade:
-  - |
-    Updates base Rocky Linux 8 cloud image to
-    Rocky-8-GenericCloud.latest.x86_64.qcow2
diff --git a/releasenotes/notes/support-ansible-vault-password-file-d00ca1e041e1bd88.yaml b/releasenotes/notes/support-ansible-vault-password-file-d00ca1e041e1bd88.yaml
index 78929788..05782097 100644
--- a/releasenotes/notes/support-ansible-vault-password-file-d00ca1e041e1bd88.yaml
+++ b/releasenotes/notes/support-ansible-vault-password-file-d00ca1e041e1bd88.yaml
@@ -1,6 +1,6 @@
 ---
 features:
   - |
-    Adds support for the ANSIBLE_VAULT_PASSWORD_FILE environment variable as a
-    source for the Ansible Vault password. See `story 2006766
+    Adds support for the ``ANSIBLE_VAULT_PASSWORD_FILE`` environment variable
+    as a source for the Ansible Vault password. See `story 2006766
     <https://storyboard.openstack.org/#!/story/2006766>`__ for details.
diff --git a/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml b/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml
deleted file mode 100644
index 57a386c4..00000000
--- a/releasenotes/notes/update-centos-cloud-image-20220913-4862bfdc89f8de3a.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-features:
-  - |
-    Updates base CentOS Stream 8 cloud image to
-    CentOS-Stream-GenericCloud-8-20220913.0.x86_64.
-- 
GitLab