Merge "Add new glance.wsgi module"

doc/source/conf.py

@@ -52,6 +52,8 @@ apidoc_excluded_paths = [
     'hacking',
     'tests/*',
     'tests',
+    'glance/wsgi/*',
+    'glance/wsgi',
     'db/sqlalchemy/*',
     'db/sqlalchemy']
 apidoc_separate_modules = True

glance/wsgi/api.py

@@ -0,0 +1,22 @@
+# 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.
+
+"""WSGI application entry-point for Glance API."""
+
+import threading
+
+from glance.common import wsgi_app
+
+application = None
+with threading.Lock():
+    if application is None:
+        application = wsgi_app.init_app()

releasenotes/notes/add-glance-wsgi-module-bbebcb5c23f41917.yaml

@@ -0,0 +1,22 @@
+---
+features:
+  - |
+    A new file, ``glance/wsgi/api.py``, has been added as a place to hold a
+    WSGI ``application`` object. This is intended to ease deployment by
+    providing a consistent location for these objects. For example, if using
+    uWSGI then instead of:
+
+    .. code-block:: ini
+
+        [uwsgi]
+        wsgi-file = /bin/glance-wsgi-api
+
+    You can now use:
+
+    .. code-block:: ini
+
+        [uwsgi]
+        module = glance.wsgi.api:application
+
+    This also simplifies deployment with other WSGI servers that expect module
+    paths such as gunicorn.