openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fix the gate jobs" into stable/pike

This commit is contained in:
Zuul 2018-05-09 09:31:38 +00:00 committed by Gerrit Code Review
parent 24f213b9a3 d705c53385
commit 6cde7ab7d6
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy-guide/source/multinode.rst
View File

@ -1,2 +1,2 @@
.. multinode:
.. include:: ../../doc/multinode.rst
.. include:: ../../doc/source/user/multinode.rst

3
deploy-guide/source/quickstart.rst
View File

@ -1,2 +1,3 @@
.. quickstart:
.. include:: ../../doc/quickstart.rst
.. include:: ../../doc/source/user/quickstart.rst

2
doc/source/user/quickstart.rst
View File

@ -29,7 +29,7 @@ bare metal or a virtual machine with Kolla.
If developing Kolla on a system that provides VirtualBox or Libvirt in addition
to Vagrant, use the Vagrant virtual environment documented in
`Development Environment with Vagrant <https://docs.openstack.org/kolla-ansible/latest/vagrant-dev-env.html>`_.
`Development Environment with Vagrant <https://docs.openstack.org/kolla-ansible/pike/contributor/vagrant-dev-env.html>`_.
Prerequisites
=============

2
test-requirements.txt
View File

@ -7,7 +7,7 @@ beautifulsoup4>=4.6.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
doc8 # Apache-2.0
extras # MIT
hacking>=0.10.0
hacking>=0.10.0,<1.1.0
openstackdocstheme>=1.16.0 # Apache-2.0
oslo.log>=3.22.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0