docs: installation: remove unnecessary blockquotes

Due to missing spaces, some of the content in the installation
guide is displayed as blockquote without being really quoted
content. This change adds the needed spaces to remove the
generated HTML blockquotes.

The repositories.txt file gets included at different locations
and that file contained the formatting spaces which were needed
from the location which includes that file. It's most of the time
better to do the indentation at the ".. include" level and leave
the file which gets included *without* indentation. Because here,
the indentation in the included file worked for some includes but
not for all, because the content got used at different indentation
levels. That made it necessary to touch the includes in
basic_deployment and post_deployment too.

Follow up patches will deal with the other install guide sections
more in details.

Change-Id: Ie2e7fea6d92f7742d23e22452e394b8ff40975eb
This commit is contained in:
Markus Zoeller 2017-09-15 14:00:47 -06:00
parent ace9d31da2
commit 1b3231d83c
5 changed files with 94 additions and 93 deletions

View File

@ -94,7 +94,7 @@ created on the undercloud, one should use a non-root user.
#. Install the ``current-tripleo`` delorean repository and deps repository:
.. include:: ../repositories.txt
.. include:: ../repositories.txt
3. Export environment variables

View File

@ -56,7 +56,7 @@ Installing the Undercloud
sudo yum install -y yum-utils
sudo yum-config-manager --enable rhelosp-rhel-7-server-opt
.. include:: ../repositories.txt
.. include:: ../repositories.txt
.. We need to manually continue our list numbering here since the above
"include" directive breaks the numbering.
@ -81,6 +81,7 @@ Installing the Undercloud
cp /usr/share/instack-undercloud/undercloud.conf.sample ~/undercloud.conf
.. TODO(bnemec): Find a more permanent location for this tool.
.. note:: There is a tool available that can help with writing a basic
undercloud.conf:
`Undercloud Configuration Wizard <http://ucw-bnemec.rhcloud.com/>`_

View File

@ -9,7 +9,7 @@ You can upgrade any packages that are installed on the undercloud machine.
#. Enable new Delorean repositories:
.. include:: ../repositories.txt
.. include:: ../repositories.txt
.. We need to manually continue our list numbering here since the above
"include" directive breaks the numbering.

View File

@ -54,7 +54,7 @@ Upgrading the Undercloud
Get and enable new repos for `NEW_VERSION`:
.. include:: ../repositories.txt
.. include:: ../repositories.txt
2. Run undercloud upgrade:

View File

@ -1,4 +1,4 @@
.. admonition:: Stable Branch
.. admonition:: Stable Branch
:class: stable
Enable the appropriate repos for the desired release, as indicated below.
@ -55,15 +55,15 @@
sudo sed -i -e 's%gpgcheck=.*%gpgcheck=0%' /etc/yum.repos.d/CentOS-Ceph-Jewel.repo
Enable last known good RDO Trunk Delorean repository for core openstack packages
Enable last known good RDO Trunk Delorean repository for core openstack packages
::
::
sudo curl -L -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos7-master/current-tripleo/delorean.repo
Enable latest RDO Trunk Delorean repository only for the |project| packages
Enable latest RDO Trunk Delorean repository only for the |project| packages
::
::
sudo curl -L -o /etc/yum.repos.d/delorean-current.repo https://trunk.rdoproject.org/centos7/current/delorean.repo
sudo sed -i 's/\[delorean\]/\[delorean-current\]/' /etc/yum.repos.d/delorean-current.repo
@ -72,13 +72,13 @@
includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-*,openstack-puppet-modules,puppet-*
EOF"
Enable the Delorean Deps repository
Enable the Delorean Deps repository
::
::
sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos7/delorean-deps.repo
.. admonition:: Ceph
.. admonition:: Ceph
:class: ceph
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph