aboutsummaryrefslogtreecommitdiff
path: root/doc/source/admin
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-20 10:21:01 +0000
committerGerrit Code Review <review@openstack.org>2018-03-20 10:21:01 +0000
commit38f21c364bfd4633df39b144955bd991a0b0990d (patch)
tree1ee77e911eb8eed9bb25cef08e37cc89188b919e /doc/source/admin
parent9e60cdf27cd5f7143e42599ae109cf819ba1d463 (diff)
parent850bd8afaf309bea16c7250923fd39b77ae2b459 (diff)
downloadkolla-38f21c364bfd4633df39b144955bd991a0b0990d.tar.gz
kolla-38f21c364bfd4633df39b144955bd991a0b0990d.zip
Merge "Follow the new PTI for document build"
Diffstat (limited to 'doc/source/admin')
-rw-r--r--doc/source/admin/image-building.rst14
-rw-r--r--doc/source/admin/template-override/ovs-dpdk.rst2
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
index d2cbc50a9..8b5581eb3 100644
--- a/doc/source/admin/image-building.rst
+++ b/doc/source/admin/image-building.rst
@@ -271,7 +271,7 @@ within the Horizon Dockerfile.
First, create a file to contain the customisations, for example:
``template-overrides.j2``. In this place the following:
-.. code-block:: none
+.. code-block:: console
{% extends parent_template %}
@@ -320,10 +320,10 @@ as part of a binary install type build:
* ``mod_ssl``
* ``gettext``
-To add a package to this list, say, ``iproute``, first create a file, for example,
-``template-overrides.j2``. In this place the following:
+To add a package to this list, say, ``iproute``, first create a file,
+for example, ``template-overrides.j2``. In this place the following:
-.. code-block:: none
+.. code-block:: console
{% extends parent_template %}
@@ -389,7 +389,7 @@ modifications to every Dockerfile.
For example, to add the ``networking-cisco`` plugin to the ``neutron_server``
image, one may want to add the following to the ``template-override`` file:
-.. code-block:: none
+.. code-block:: console
{% extends parent_template %}
@@ -451,7 +451,7 @@ structure:
The template now becomes:
-.. code-block:: none
+.. code-block:: console
{% block neutron_server_footer %}
ADD plugins-archive /
@@ -524,7 +524,7 @@ feature for binary build type.
The template now becomes:
-.. code-block:: none
+.. code-block:: console
{% block neutron_server_footer %}
ADD additions-archive /
diff --git a/doc/source/admin/template-override/ovs-dpdk.rst b/doc/source/admin/template-override/ovs-dpdk.rst
index 7660f4665..e000a80e7 100644
--- a/doc/source/admin/template-override/ovs-dpdk.rst
+++ b/doc/source/admin/template-override/ovs-dpdk.rst
@@ -17,7 +17,7 @@ ________________
In this place the ``contrib/template-override/ovs-dpdk.j2`` file:
-.. code-block:: none
+.. code-block:: console
[openvswitch-base-plugin-ovs]
type = git