openstack/openstack-manuals
Code Issues Proposed changes

Merge "Remove parallel building"

Browse Source
This commit is contained in:
Jenkins 2016-03-15 22:29:52 +00:00 committed by Gerrit Code Review
commit 5f086b96ec
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/arch-design-draft/source/introduction.rst
View File

@ -58,6 +58,9 @@ developing cloud architecture design documents. The sections covered are:
* :doc:`Legal requirements<legal-requirements>`: The legal requirements you * :doc:`Legal requirements<legal-requirements>`: The legal requirements you
will need to consider for the different OpenStack scenarios. will need to consider for the different OpenStack scenarios.
* :doc:`Example architectures<example-architectures>`: An examination of some .. TODO(jaegerandi): Use below :doc:`Example
architectures<example-architectures>`
* Example architectures: An examination of some
of the most common uses for OpenStack clouds, and explanations of the of the most common uses for OpenStack clouds, and explanations of the
considerations for each use case. considerations for each use case.

2
doc/networking-guide/source/adv-config-dns.rst
View File

@ -185,7 +185,7 @@ In the above example notice that:
* The name given to the instance by the user, ``my_vm``, is sanitized by the * The name given to the instance by the user, ``my_vm``, is sanitized by the
Compute service and becomes ``my-vm`` as the port's ``dns_name``. Compute service and becomes ``my-vm`` as the port's ``dns_name``.
* The port's ``dns_assignment`` attribute shows that its :term:`FQDN` is * The port's ``dns_assignment`` attribute shows that its FQDN is
``my-vm.my-domain.org.`` in the Networking service internal DNS, which is ``my-vm.my-domain.org.`` in the Networking service internal DNS, which is
the result of concatenating the port's ``dns_name`` with the value configured the result of concatenating the port's ``dns_name`` with the value configured
in the ``dns_domain`` parameter in ``neutron.conf``, as explained previously. in the ``dns_domain`` parameter in ``neutron.conf``, as explained previously.

10
tools/build-rst.sh
View File

@ -32,12 +32,6 @@ TAG_OPT=""
BUILD="" BUILD=""
LINKCHECK="" LINKCHECK=""
if [ -x "$(command -v getconf)" ]; then
NUMBER_OF_CORES=$(getconf _NPROCESSORS_ONLN)
else
NUMBER_OF_CORES=2
fi
while [[ $# > 0 ]] ; do while [[ $# > 0 ]] ; do
option="$1" option="$1"
case $option in case $option in
@ -91,13 +85,13 @@ fi
if [ "$LINKCHECK" = "1" ] ; then if [ "$LINKCHECK" = "1" ] ; then
# Show sphinx-build invocation for easy reproduction # Show sphinx-build invocation for easy reproduction
set -x set -x
sphinx-build -j $NUMBER_OF_CORES -E -W -d $DOCTREES -b linkcheck \ sphinx-build -E -W -d $DOCTREES -b linkcheck \
$TAG_OPT $DIRECTORY/source $BUILD_DIR $TAG_OPT $DIRECTORY/source $BUILD_DIR
set +x set +x
else else
# Show sphinx-build invocation for easy reproduction # Show sphinx-build invocation for easy reproduction
set -x set -x
sphinx-build -j $NUMBER_OF_CORES -E -W -d $DOCTREES -b html \ sphinx-build -E -W -d $DOCTREES -b html \
$TAG_OPT $DIRECTORY/source $BUILD_DIR $TAG_OPT $DIRECTORY/source $BUILD_DIR
set +x set +x