Fix rendering of notes and code in major upgrade docs

Some notes and code in major upgrade docs rendered differently than in
the rest of the TripleO docs, it was due to indentation of the blocks
putting them inside a blockquote tag, which messed up the applied CSS
rules.

Change-Id: I3fe17c24115f294c70af145b5e93802f3674f74e
This commit is contained in:
Jiri Stransky 2018-10-18 13:45:39 +02:00
parent 60411f9dbf
commit 15b7d449b4
1 changed files with 75 additions and 75 deletions

View File

@ -30,7 +30,7 @@ The overcloud upgrade workflow is mainly delivered through the
subcommands: **prepare**, **run** and **converge**. Each subcommand
has its own set of options which you can explore with ``--help``:
.. code-block:: bash
.. code-block:: bash
source /home/stack/stackrc
openstack overcloud upgrade run --help
@ -105,7 +105,7 @@ UpgradeInitCommand_ tripleo-heat-templates parameter, that can be used to
switch the yum repos in use by the nodes during the upgrade. This will likely
be the same commands that were used to switch repositories on the undercloud.
.. code-block:: bash
.. code-block:: bash
cat <<EOF > init-repo.yaml
parameter_defaults:
@ -125,20 +125,20 @@ the -e option.
openstack overcloud upgrade prepare
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. note::
.. note::
Before running the overcloud upgrade prepare ensure you have a valid backup
of the current state, including the **undercloud** since there will be a
Heat stack update performed here.
.. note::
.. note::
If you have enabled neutron_DVR_ in your deployment you must ensure that
compute nodes are connected to the External network via the
roles_data.yaml that you will pass using the -r parameter to upgrade prepare.
This is necessary to allow floating IP connectivity via the external api network.
.. note::
.. note::
After running the upgrade prepare and until successful completion
of the upgrade converge operation, stack updates to the deployment Heat
@ -154,13 +154,13 @@ as the roles_data.yaml and network_data.yaml, if you've customized
those. Be sure to include environment files with the new container
image parameter and Yum repository switch parameter.
.. note::
.. note::
It is especially important to remember that you **must** include all
environment files that were used to deploy the overcloud including the
container image references file for the target version container images
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade prepare --templates \
-r /path/to/roles_data.yaml \
@ -176,7 +176,7 @@ UPDATE_COMPLETE state. At that point you can use `config download` to
download and inspect the configuration ansible playbooks that will be
used to deliver the upgrade in the next step:
.. code-block:: bash
.. code-block:: bash
openstack overcloud config download --config-dir SOMEDIR
# playbooks will be downloaded to SOMEDIR directory
@ -209,7 +209,7 @@ playbooks are invoked on those overcloud nodes specified by the ``--roles`` or
step. For non controlplane nodes, such as Compute or Storage, you can use
``--nodes`` to specify a single node or list of nodes to upgrade.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade run --roles Controller
@ -217,7 +217,7 @@ step. For non controlplane nodes, such as Compute or Storage, you can use
playbooks: You need to run all three in this order and as specified below
(no path) for a full upgrade.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade run --roles Controller --playbook upgrade_steps_playbook.yaml
openstack overcloud upgrade run --roles Controller --playbook deploy_steps_playbook.yaml
@ -227,7 +227,7 @@ After all three playbooks have been executed without error on all nodes of
the controller role the controlplane will have been fully upgraded to Queens.
At a minimum an operator should check the health of the pacemaker cluster.
.. code-block:: bash
.. code-block:: bash
[root@overcloud-controller-0 ~]# pcs status | grep -C 10 -i "error\|fail"
@ -235,7 +235,7 @@ The operator may also want to confirm that openstack and related service
containers are all in a good state and using the target version (new) images
passed during upgrade prepare.
.. code-block:: bash
.. code-block:: bash
[root@overcloud-controller-0 ~]# docker ps -a
@ -245,7 +245,7 @@ For non controlplane nodes, such as Compute or ObjectStorage, you can use
upgraded in parallel. Also note that you can still use the ``--roles`` parameter
with non controlplane roles if that is preferred.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade run --nodes overcloud-compute-0
@ -259,7 +259,7 @@ Again you can optionally step through the upgrade playbooks if you prefer. Be
sure to run upgrade_steps_playbook.yaml then deploy_steps_playbook.yaml and
finally post_upgrade_steps_playbook.yaml in that order.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade run --nodes overcloud-compute-1 \
--playbook upgrade_steps_playbook.yaml
@ -269,7 +269,7 @@ For re-run, you can specify ``--skip-tags`` validation to skip those step 0
ansible tasks that check if services are running, in case you can't or
don't want to start them all.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade run --roles Controller --skip-tags validation
@ -363,7 +363,7 @@ assert that the overcloud state is in sync with the latest TripleO
Heat templates, which is a prerequisite for any further overcloud
management (e.g. scaling).
.. note::
.. note::
It is especially important to remember that you **must** include
all environment files that were used to deploy the overcloud,
@ -372,7 +372,7 @@ management (e.g. scaling).
environment files you are about to use is specifying a value for
UpgradeInitCommand.
.. code-block:: bash
.. code-block:: bash
openstack overcloud upgrade converge --templates
-r /path/to/roles_data.yaml \