From 4743b08f47d5058f557d923736837cee16ecb2e2 Mon Sep 17 00:00:00 2001
From: Takashi NATSUME <natsume.takashi@lab.ntt.co.jp>
Date: Fri, 25 Jan 2019 14:47:06 +0900
Subject: [PATCH] Remove unused quota options

Remove the following configuration options in the 'quota' group
because they have not been used any more
since Ie01ab1c3a1219f1d123f0ecedc66a00dfb2eb2c1.

- reservation_expire
- until_refresh
- max_age

Change-Id: I56401daa8a2eee5e3aede336b26292f77cc0edd6
---
 nova/conf/quota.py                            | 32 -------------------
 nova/tests/unit/test_quota.py                 |  6 ----
 ...remove-quota-options-0e407c56ea993f5a.yaml |  9 ++++++
 3 files changed, 9 insertions(+), 38 deletions(-)
 create mode 100644 releasenotes/notes/remove-quota-options-0e407c56ea993f5a.yaml

diff --git a/nova/conf/quota.py b/nova/conf/quota.py
index 2a0be94b1eea..212d44299669 100644
--- a/nova/conf/quota.py
+++ b/nova/conf/quota.py
@@ -254,38 +254,6 @@ Possible values:
 
 * A positive integer or 0.
 * -1 to disable the quota.
-"""),
-    # TODO(stephenfin): This should have a min parameter
-    cfg.IntOpt('reservation_expire',
-        default=86400,
-        deprecated_group='DEFAULT',
-        help="""
-The number of seconds until a reservation expires.
-
-This quota represents the time period for invalidating quota reservations.
-"""),
-    cfg.IntOpt('until_refresh',
-        min=0,
-        default=0,
-        deprecated_group='DEFAULT',
-        help="""
-The count of reservations until usage is refreshed.
-
-This defaults to 0 (off) to avoid additional load but it is useful to turn on
-to help keep quota usage up-to-date and reduce the impact of out of sync usage
-issues.
-"""),
-    cfg.IntOpt('max_age',
-        min=0,
-        default=0,
-        deprecated_group='DEFAULT',
-        help="""
-The number of seconds between subsequent usage refreshes.
-
-This defaults to 0 (off) to avoid additional load but it is useful to turn on
-to help keep quota usage up-to-date and reduce the impact of out of sync usage
-issues. Note that quotas are not updated on a periodic task, they will update
-on a new reservation if max_age has passed since the last reservation.
 """),
     cfg.StrOpt('driver',
         default='nova.quota.DbQuotaDriver',
diff --git a/nova/tests/unit/test_quota.py b/nova/tests/unit/test_quota.py
index e37d9399d7f1..5b8801ee945c 100644
--- a/nova/tests/unit/test_quota.py
+++ b/nova/tests/unit/test_quota.py
@@ -588,9 +588,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                    security_group_rules=20,
                    server_groups=10,
                    server_group_members=10,
-                   reservation_expire=86400,
-                   until_refresh=0,
-                   max_age=0,
                    group='quota'
                    )
 
@@ -1980,9 +1977,6 @@ class NoopQuotaDriverTestCase(test.TestCase):
                    injected_file_path_length=255,
                    security_groups=10,
                    security_group_rules=20,
-                   reservation_expire=86400,
-                   until_refresh=0,
-                   max_age=0,
                    group='quota'
                    )
 
diff --git a/releasenotes/notes/remove-quota-options-0e407c56ea993f5a.yaml b/releasenotes/notes/remove-quota-options-0e407c56ea993f5a.yaml
new file mode 100644
index 000000000000..5d6b23caac11
--- /dev/null
+++ b/releasenotes/notes/remove-quota-options-0e407c56ea993f5a.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The following configuration options in the ``quota`` group have been
+    removed because they have not been used since 17.0.0.
+
+    - ``reservation_expire``
+    - ``until_refresh``
+    - ``max_age``