aboutsummaryrefslogtreecommitdiff
path: root/doc/source/admin/template-override
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-12 10:00:32 +0000
committerGerrit Code Review <review@openstack.org>2017-10-12 10:00:32 +0000
commitd67146637ee4f0d37d5ccba88f8d2207cbd5e1a2 (patch)
treef1d6e6496d4de3ae04b4ef8db07b68391986d6d0 /doc/source/admin/template-override
parent775cca5a49fafa1cd2c40409af6da2048adcba35 (diff)
parent5493fb64e11d2ec961c440dbeb9a71b033f3be0b (diff)
downloadkolla-d67146637ee4f0d37d5ccba88f8d2207cbd5e1a2.tar.gz
kolla-d67146637ee4f0d37d5ccba88f8d2207cbd5e1a2.zip
Merge "Rearrange existing documentation to fit the new standard layout"
Diffstat (limited to 'doc/source/admin/template-override')
-rw-r--r--doc/source/admin/template-override/opendaylight-source.rst27
-rw-r--r--doc/source/admin/template-override/ovs-dpdk.rst31
2 files changed, 58 insertions, 0 deletions
diff --git a/doc/source/admin/template-override/opendaylight-source.rst b/doc/source/admin/template-override/opendaylight-source.rst
new file mode 100644
index 000000000..61a3415ba
--- /dev/null
+++ b/doc/source/admin/template-override/opendaylight-source.rst
@@ -0,0 +1,27 @@
+==================
+OpenDaylight Build
+==================
+
+The `opendaylight-template-overrides.j2` template override shows how to build
+an OpenDaylight container image with a different version than the one packaged
+with the distro.
+
+Building OpenDaylight Container Images
+======================================
+
+kolla-build.conf
+----------------
+
+Point to the desired version of OpenDaylight in `kolla-build.conf`:
+
+.. code-block:: console
+
+ [opendaylight]
+ type = url
+ location = https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz
+
+Build the container by executing the following command:
+
+::
+
+ kolla-build --type source --template-override contrib/template-override/opendaylight-template-overrides.j2 opendaylight
diff --git a/doc/source/admin/template-override/ovs-dpdk.rst b/doc/source/admin/template-override/ovs-dpdk.rst
new file mode 100644
index 000000000..e47cfe0ff
--- /dev/null
+++ b/doc/source/admin/template-override/ovs-dpdk.rst
@@ -0,0 +1,31 @@
+OVS-DPDK Source build
+=====================
+
+CentOS and Oracle Linux currently do not provide packages
+for ovs with dpdk.
+The Ubuntu packages do not support UIO based drivers.
+To use the uio_pci_generic driver on Ubuntu a source build is required.
+
+Building ovs with dpdk containers from source
+---------------------------------------------
+
+- Append the following to /etc/kolla/kolla-build.conf to select the version
+ of ovs and dpdk to use for your source build.
+
+kolla-build.conf
+________________
+
+[openvswitch-base-plugin-ovs]
+type = git
+location = https://github.com/openvswitch/ovs.git
+reference = v2.7.0
+
+[openvswitch-base-plugin-dpdk]
+type = git
+location = http://dpdk.org/git/dpdk
+reference = v17.02
+
+- To build the container execute the follow command::
+
+ tools/build.py --template-override \
+ contrib/template-override/ovs-dpdk.j2 dpdk