Merge "Cleanup deprecated and ineffective api options"

designate/conf/api.py

@@ -45,15 +45,6 @@ API_OPTS = [
                 help='Enable the Designate V2 API'),
     cfg.BoolOpt('enable_api_admin', default=False,
                 help='enable-api-admin'),
-    cfg.IntOpt('max_header_line', default=16384,
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter has had no effect since '
-                                 'Train. Use [DEFAULT] max_header_line '
-                                 'instead.',
-               help="Maximum line size of message headers to be accepted. "
-                    "max_header_line may need to be increased when using "
-                    "large tokens (typically those generated by the "
-                    "Keystone v3 API with big service catalogs)."),
     cfg.BoolOpt('pecan_debug', default=False,
                 help='Pecan HTML Debug Interface'),
 ]
@@ -86,23 +77,6 @@ API_MIDDLEWARE_OPTS = [
                 help='Enable API Maintenance Mode'),
     cfg.StrOpt('maintenance_mode_role', default='admin',
                help='Role allowed to bypass maintaince mode'),
-    cfg.StrOpt('secure_proxy_ssl_header',
-               default='X-Forwarded-Proto',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter has had no effect since '
-                                 'SSLMiddleware was replaced by '
-                                 'http_proxy_to_wsgi',
-               help="The HTTP Header that will be used to determine which "
-                    "the original request protocol scheme was, even if it was "
-                    "removed by an SSL terminating proxy."),
-    cfg.StrOpt('override_proto',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter has had no effect since '
-                                 'SSLMiddleware was replaced by '
-                                 'http_proxy_to_wsgi',
-               help="A scheme that will be used to override "
-                    "the request protocol scheme, even if it was "
-                    "set by an SSL terminating proxy."),
 ]
 
 

releasenotes/notes/cleanup-api-options-dalmetian-32e879f025ab6580.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following deprecated options have been removed.
+
+    - ``[service:api] max_header_line``
+    - ``[service:api] secure_proxy_ssl_header``
+    - ``[service:api] override_proto``