From c6d1e169ed6049cb7da0b5f117e57ceb8ca2871e Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Sun, 21 Jan 2018 23:38:01 +0900
Subject: [PATCH] Add note for Django 1.8-1.10 support in relnote and doc

As we discussed in the team meeting, we plan to drop Django 1.8
to 1.10 support in Rocky. It is worth mentioned in the release note
and the document.

Change-Id: I11a4f4ec1d2a237fad7c58951ff23affd0b5708d
---
 doc/source/install/from-source.rst            | 22 +---------------
 doc/source/install/index.rst                  | 10 ++++++-
 doc/source/install/system-requirements.rst    | 26 +++++++++++++++++++
 ...jango-version-queens-b7785b96ecbceaf0.yaml |  5 ++++
 4 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 doc/source/install/system-requirements.rst
 create mode 100644 releasenotes/notes/django-version-queens-b7785b96ecbceaf0.yaml

diff --git a/doc/source/install/from-source.rst b/doc/source/install/from-source.rst
index c0ca1e1f45..815d06e0ed 100644
--- a/doc/source/install/from-source.rst
+++ b/doc/source/install/from-source.rst
@@ -6,27 +6,7 @@ This page covers the basic installation of horizon in a production
 environment. If you are looking for a developer environment, see
 :ref:`quickstart`.
 
-.. _system-requirements-label:
-
-System Requirements
-===================
-
-* Python 2.7
-* Django 1.8
-* An accessible `keystone <https://docs.openstack.org/keystone/latest/>`_ endpoint
-
-* All other services are optional.
-  Horizon supports the following services as of the Pike release.
-  If the keystone endpoint for a service is configured,
-  horizon detects it and enables its support automatically.
-
-  * `cinder <https://docs.openstack.org/cinder/latest/>`_: Block Storage
-  * `glance <https://docs.openstack.org/glance/latest/>`_: Image Management
-  * `neutron <https://docs.openstack.org/neutron/latest/>`_: Networking
-  * `nova <https://docs.openstack.org/nova/latest/>`_: Compute
-  * `swift <https://docs.openstack.org/swift/latest/>`_: Object Storage
-  * Horizon also supports many other OpenStack services via plugins. For more
-    information, see the :ref:`install-plugin-registry`.
+For the system dependencies, see :doc:`system-requirements`.
 
 Installation
 ============
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 2e4c4b9448..64ad8aa94e 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -16,6 +16,14 @@ in environments with stand-alone services such as Object Storage.
    of the Identity service using the Apache HTTP server and Memcached
    service.
 
+System Requirements
+===================
+
+.. toctree::
+   :maxdepth: 1
+
+   system-requirements
+
 Installing from Packages
 ========================
 
@@ -31,7 +39,7 @@ Installing from Source
 ======================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
    from-source.rst
 
diff --git a/doc/source/install/system-requirements.rst b/doc/source/install/system-requirements.rst
new file mode 100644
index 0000000000..0d4cb20eaa
--- /dev/null
+++ b/doc/source/install/system-requirements.rst
@@ -0,0 +1,26 @@
+===================
+System Requirements
+===================
+
+The Queens release of horizon has the following dependencies.
+
+* Python 2.7
+* Django 1.11
+
+  * Django 1.8 to 1.10 are also supported.
+    Their support will be dropped in the Rocky release.
+
+* An accessible `keystone <https://docs.openstack.org/keystone/latest/>`_ endpoint
+
+* All other services are optional.
+  Horizon supports the following services as of the Queens release.
+  If the keystone endpoint for a service is configured,
+  horizon detects it and enables its support automatically.
+
+  * `cinder <https://docs.openstack.org/cinder/latest/>`_: Block Storage
+  * `glance <https://docs.openstack.org/glance/latest/>`_: Image Management
+  * `neutron <https://docs.openstack.org/neutron/latest/>`_: Networking
+  * `nova <https://docs.openstack.org/nova/latest/>`_: Compute
+  * `swift <https://docs.openstack.org/swift/latest/>`_: Object Storage
+  * Horizon also supports many other OpenStack services via plugins. For more
+    information, see the :ref:`install-plugin-registry`.
diff --git a/releasenotes/notes/django-version-queens-b7785b96ecbceaf0.yaml b/releasenotes/notes/django-version-queens-b7785b96ecbceaf0.yaml
new file mode 100644
index 0000000000..9169877054
--- /dev/null
+++ b/releasenotes/notes/django-version-queens-b7785b96ecbceaf0.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    The Queens release of horizon depends on Django 1.8 to 1.11, but
+    Django 1.8 to 1.10 support will be dropped in the next release (Rocky).