Merge "Add new nova.wsgi module"

nova/wsgi/metadata.py

@@ -0,0 +1,24 @@
+# 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 Nova Metadata API."""
+
+import threading
+
+from nova.api.openstack import wsgi_app
+
+NAME = "metadata"
+
+application = None
+with threading.Lock():
+    if application is None:
+        application = wsgi_app.init_application(NAME)

nova/wsgi/osapi_compute.py

@@ -0,0 +1,24 @@
+# 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 Nova Compute API."""
+
+import threading
+
+from nova.api.openstack import wsgi_app
+
+NAME = "osapi_compute"
+
+application = None
+with threading.Lock():
+    if application is None:
+        application = wsgi_app.init_application(NAME)

releasenotes/notes/add-nova-wsgi-module-3cc250a78fef7365.yaml

@@ -0,0 +1,22 @@
+---
+features:
+  - |
+    A new module, ``nova.wsgi``, has been added as a place to gather WSGI
+    ``application`` objects. 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/nova-api-wsgi
+
+    You can now use:
+
+    .. code-block:: ini
+
+        [uwsgi]
+        module = nova.wsgi.osapi_compute:application
+
+    This also simplifies deployment with other WSGI servers that expect module
+    paths such as gunicorn.