Merge "Prep for 5.0 release"

releasenotes/notes/5.0-release-afb1fbbe595b6bc8.yaml

@@ -0,0 +1,6 @@
+---
+prelude: >
+    This release adds support for manual cleaning and
+    RAID configuration. Operators may now manually
+    run clean steps, including setting up RAID on a
+    node, while a node is in the manageable state.

releasenotes/notes/add-choice-to-some-options-9fb327c48e6bfda1.yaml

@@ -1,15 +1,21 @@
 ---
 upgrade:
-  - Add ``choices`` parameter to config options. Invalid values will be
+  - |
+    Add ``choices`` parameter to config options. Invalid values will be
     rejected when first accessing them, which can happen in the middle of
     deployment.
-    * [DEFAULT]/auth_strategy         [keystone, noauth]
-    * [glance]/auth_strategy          [keystone, noauth]
-    * [glance]/glance_protocol        [http, https]
-    * [neutron]/auth_strategy         [keystone, noauth]
-    * [amt]/protocol                  [http, https]
-    * [irmc]/remote_image_share_type  [CIFS, NFS]
-    * [irmc]/port                     [443, 80]
-    * [irmc]/auth_method              [basic, digest]
-    * [irmc]/sensor_method            [ipmitool, scci]
+
+    =================================  ================
+                 Option                     Choices
+    =================================  ================
+    [DEFAULT]/auth_strategy            keystone, noauth
+    [glance]/auth_strategy             keystone, noauth
+    [glance]/glance_protocol           http, https
+    [neutron]/auth_strategy            keystone, noauth
+    [amt]/protocol                     http, https
+    [irmc]/remote_image_share_type     CIFS, NFS
+    [irmc]/port                        443, 80
+    [irmc]/auth_method                 basic, digest
+    [irmc]/sensor_method               ipmitool, scci
+    =================================  ================