Fix double index entry

We cannot use ..only.. with a toctree, it gets parsed at the wrong
time.

Add a second Debian specific index file so that Debian gets only this
file. This avoids the double index entry in the sidetable but leads to
no index table for Debian.

Change-Id: I6f4e7dffb2c5cd4416607817dcb3685b65b0674d
Partial-Fix: #1488187
This commit is contained in:
Andreas Jaeger 2015-08-24 20:09:04 +02:00
parent 8c010b5d3c
commit dc3a3978cf
9 changed files with 112 additions and 42 deletions

View File

@ -53,6 +53,11 @@ source_suffix = '.rst'
# The master toctree document.
master_doc = 'index'
# We need to use noqa here since tags is defined externally.
if tags.has('debian'): # noqa
master_doc = 'index-debian'
else:
master_doc = 'index'
# General information about the project.
project = u'Installation Guide'
@ -91,6 +96,10 @@ html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag}
# directories to ignore when looking for source files.
exclude_patterns = ['common/cli*', 'common/nova*',
'common/log_in_dashboard.rst']
if tags.has('debian'): # noqa
exclude_patterns.append('index.rst')
else:
exclude_patterns.append('index-debian.rst')
# The reST default role (used for this markup: `text`) to use for all
# documents.

View File

@ -1,3 +1,5 @@
:orphan:
======================
Register API endpoints
======================

View File

@ -1,3 +1,5 @@
:orphan:
================
debconf concepts
================

View File

@ -1,3 +1,5 @@
:orphan:
===========================================
Configure the database with dbconfig-common
===========================================

View File

@ -1,3 +1,5 @@
:orphan:
======================================
Services and the [keystone_authtoken]
======================================

View File

@ -1,3 +1,5 @@
:orphan:
===============================
RabbitMQ credentials parameters
===============================

View File

@ -1,3 +1,5 @@
:orphan:
================================
Configure OpenStack with debconf
================================

View File

@ -0,0 +1,74 @@
=======================================
OpenStack Installation Guide for Debian
=======================================
Abstract
~~~~~~~~
The OpenStack system consists of several key projects that you install
separately. These projects work together depending on your cloud
needs. These projects include Compute, Identity Service, Networking,
Image Service, Block Storage, Object Storage, Telemetry,
Orchestration, and Database. You can install any of these projects
separately and configure them stand-alone or as connected entities.
.. only:: rdo
This guide shows you how to install OpenStack by using packages
available through Fedora 21 as well as on Red Hat Enterprise Linux
7 and its derivatives through the EPEL repository.
.. only:: ubuntu
This guide walks through an installation by using packages
available through Ubuntu 14.04.
.. only:: obs
This guide shows you how to install OpenStack by using packages on
openSUSE 13.2 and SUSE Linux Enterprise Server 12 through the Open
Build Service Cloud repository.
.. only:: debian
This guide walks through an installation by using packages
available through Debian 8 (code name: Jessie).
Explanations of configuration options and sample configuration files
are included.
This guide documents OpenStack Liberty release.
.. warning:: This guide is a work-in-progress and changing rapidly
while we continue to test and enhance the guidance. Please note
where there are open "to do" items and help where you are able.
Contents
~~~~~~~~
.. toctree::
:maxdepth: 2
overview.rst
basic_environment.rst
debconf/debconf.rst
keystone.rst
glance.rst
nova.rst
networking.rst
horizon.rst
cinder.rst
swift.rst
heat.rst
ceilometer.rst
launch-instance.rst
app_reserved_uids.rst
common/app_support.rst
common/glossary.rst
Search in this guide
~~~~~~~~~~~~~~~~~~~~
* :ref:`search`

View File

@ -71,9 +71,7 @@ This guide documents OpenStack Liberty release.
Contents
~~~~~~~~
.. only:: obs or rdo or ubuntu
.. toctree::
.. toctree::
:maxdepth: 2
overview.rst
@ -93,29 +91,6 @@ Contents
common/app_support.rst
common/glossary.rst
.. only:: debian
.. toctree::
:maxdepth: 2
overview.rst
basic_environment.rst
debconf/debconf.rst
keystone.rst
glance.rst
nova.rst
networking.rst
horizon.rst
cinder.rst
swift.rst
heat.rst
ceilometer.rst
launch-instance.rst
app_reserved_uids.rst
common/app_support.rst
common/glossary.rst
Search in this guide
~~~~~~~~~~~~~~~~~~~~