From f0d2925bc71d0649f75fd3d281742f2e56e7e3b6 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Fri, 3 Aug 2018 11:33:57 -0400
Subject: [PATCH] Deprecate upgrade_levels options for deprecated/removed
 services

* nova-cert was removed in Pike: 2bcee77e3

* nova-network has been deprecated since newton: 7d5fc4868

* nova-consoleauth was deprecated in rocky: e91dad3ee

So start the timer on the related upgrade_levels options
so we can remove them.

Change-Id: Ied416335d36fe3324fb1c5c78353affe1332ba90
---
 nova/conf/upgrade_levels.py                    | 18 ++++++++++++++++++
 ...pgrade-levels-options-bbe19bb2256e25ad.yaml | 12 ++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 releasenotes/notes/rocky-deprecate-some-upgrade-levels-options-bbe19bb2256e25ad.yaml

diff --git a/nova/conf/upgrade_levels.py b/nova/conf/upgrade_levels.py
index 2088a2fbf141..24538f97548f 100644
--- a/nova/conf/upgrade_levels.py
+++ b/nova/conf/upgrade_levels.py
@@ -85,6 +85,12 @@ Possible values:
   'liberty'.
 """),
     cfg.StrOpt("cert",
+        deprecated_for_removal=True,
+        deprecated_since='18.0.0',
+        deprecated_reason="""
+The nova-cert service was removed in 16.0.0 (Pike) so this option
+is no longer used.
+""",
         help="""
 Cert RPC API version cap.
 
@@ -133,6 +139,12 @@ Possible values:
   'liberty'.
 """),
     cfg.StrOpt('consoleauth',
+        deprecated_for_removal=True,
+        deprecated_since='18.0.0',
+        deprecated_reason="""
+The nova-consoleauth service was deprecated in 18.0.0 (Rocky) and will be
+removed in an upcoming release.
+""",
         help="""
 Consoleauth RPC API version cap.
 
@@ -145,6 +157,12 @@ Possible values:
   'liberty'.
 """),
     cfg.StrOpt('network',
+        deprecated_for_removal=True,
+        deprecated_since='18.0.0',
+        deprecated_reason="""
+The nova-network service was deprecated in 14.0.0 (Newton) and will be
+removed in an upcoming release.
+""",
         help="""
 Network RPC API version cap.
 
diff --git a/releasenotes/notes/rocky-deprecate-some-upgrade-levels-options-bbe19bb2256e25ad.yaml b/releasenotes/notes/rocky-deprecate-some-upgrade-levels-options-bbe19bb2256e25ad.yaml
new file mode 100644
index 000000000000..276e4c3cb693
--- /dev/null
+++ b/releasenotes/notes/rocky-deprecate-some-upgrade-levels-options-bbe19bb2256e25ad.yaml
@@ -0,0 +1,12 @@
+---
+deprecations:
+  - |
+    The following configuration options in the ``[upgrade_levels]`` group
+    have been deprecated:
+
+    * ``network`` - The ``nova-network`` service was deprecated in the 14.0.0
+      Newton release and will be removed in an upcoming release.
+    * ``cert`` - The ``nova-cert`` service was removed in the 16.0.0 Pike
+      release so this option is no longer used.
+    * ``consoleauth`` - The ``nova-consoleauth`` service was deprecated in the
+      18.0.0 Rocky release and will be removed in an upcoming release.