Sync Sphinx requirement

1. Sync sphinx dependency with global requirements. It caps python 2 since
sphinx 2.0 no longer supports Python 2.7.
2. Remove unncessary "=="

Change-Id: I3451c44a30a2e3d4bb58d2ac512e69da0781e961
This commit is contained in:
jacky06 2019-06-19 17:49:36 +08:00
parent 89f5bfe3ac
commit 4fd741d6bf
3 changed files with 7 additions and 5 deletions

View File

@ -1,6 +1,8 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
sphinx>=1.6.2 # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
sphinxcontrib-blockdiag>=1.1.0 sphinxcontrib-blockdiag>=1.1.0
openstackdocstheme>=1.28.0 # Apache-2.0 openstackdocstheme>=1.28.0 # Apache-2.0

View File

@ -250,7 +250,7 @@ Neutron and Horizon LOCI images
Deploy TaaS Plugin Deploy TaaS Plugin
==================== ==================
Override images in Neutron chart Override images in Neutron chart
--------------------------------- ---------------------------------
@ -299,7 +299,7 @@ to configure the ``service_provider`` endpoint used by Neutron TaaS plugin:
Deploy TaaS Dashboard Plugin Deploy TaaS Dashboard Plugin
============================== ============================
TaaS dashboard plugin can be deployed simply by using custom LOCI images having TaaS dashboard plugin can be deployed simply by using custom LOCI images having
TaaS Dashboard code installed (as explained in above sections), i.e. override TaaS Dashboard code installed (as explained in above sections), i.e. override
@ -314,7 +314,7 @@ the :code:`images` section parameters for Horizon charts:
Set log level for TaaS Set log level for TaaS
======================= ======================
Default log level for Neutron TaaS is :code:`INFO`. For changing it, override Default log level for Neutron TaaS is :code:`INFO`. For changing it, override
following parameter: following parameter:

View File

@ -98,7 +98,7 @@ Ceph status shows that the monitor running on ``voyager3`` is now in quorum.
pgs: 182 active+clean pgs: 182 active+clean
Case: A host machine where ceph-mon is running is down Case: A host machine where ceph-mon is running is down
======================================================== ======================================================
This is for the case when a host machine (where ceph-mon is running) is down. This is for the case when a host machine (where ceph-mon is running) is down.