diff --git a/ironic/api/app.wsgi b/ironic/api/app.wsgi deleted file mode 100644 index d9e5c053b3..0000000000 --- a/ironic/api/app.wsgi +++ /dev/null @@ -1,21 +0,0 @@ -# -*- mode: python -*- -# -*- encoding: utf-8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -""" -Use this file for deploying the API service under Apache2 mod_wsgi. -""" - -from ironic.api import wsgi - -application = wsgi.initialize_wsgi_app(show_deprecated=True) diff --git a/ironic/api/wsgi.py b/ironic/api/wsgi.py index 7daf19980c..851319d740 100644 --- a/ironic/api/wsgi.py +++ b/ironic/api/wsgi.py @@ -25,7 +25,7 @@ CONF = cfg.CONF LOG = log.getLogger(__name__) -def initialize_wsgi_app(show_deprecated=False): +def initialize_wsgi_app(): i18n.install('ironic') service.prepare_service(sys.argv) @@ -33,9 +33,4 @@ def initialize_wsgi_app(show_deprecated=False): LOG.debug("Configuration:") CONF.log_opt_values(LOG, log.DEBUG) - if show_deprecated: - LOG.warning("Using ironic/api/app.wsgi is deprecated and it will " - "be removed in Rocky release. Please use automatically " - "generated ironic-api-wsgi instead.") - return app.VersionSelectorApplication() diff --git a/releasenotes/notes/remove-app-wsgi-d5887ca28e4b9f00.yaml b/releasenotes/notes/remove-app-wsgi-d5887ca28e4b9f00.yaml new file mode 100644 index 0000000000..563055cc01 --- /dev/null +++ b/releasenotes/notes/remove-app-wsgi-d5887ca28e4b9f00.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - remove deprecated ``ironic/api/app.wsgi`` script. + The automatically generated ``ironic-api-wsgi`` script should be used + instead.