aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-05-19 17:24:18 +0200
committerMartin André <m.andre@redhat.com>2017-08-17 19:10:33 +0200
commit847f4822c5444ec78234fdc96142c01c769c2f50 (patch)
tree42457379d02dfc5f75cf4ef97dde13cd559d56b2 /doc
parent8110b55d60540618bf0886a74e6ec9acdba33eb9 (diff)
downloadkolla-847f4822c5444ec78234fdc96142c01c769c2f50.tar.gz
kolla-847f4822c5444ec78234fdc96142c01c769c2f50.zip
Cleanup opendaylight-template-overrides
The neutron OpenDaylight drivers can now be customized with the neutron-server-opendaylight image, there is no need to add them to the override file. Update OpenDaylight overrides file documentation to make it clear this is only available for source builds. Change-Id: I12503810f80ca18f42e5f2ebeac835bccced02fd
Diffstat (limited to 'doc')
-rw-r--r--doc/template-override/opendaylight-source.rst23
1 files changed, 8 insertions, 15 deletions
diff --git a/doc/template-override/opendaylight-source.rst b/doc/template-override/opendaylight-source.rst
index c34b920c6..344a0de07 100644
--- a/doc/template-override/opendaylight-source.rst
+++ b/doc/template-override/opendaylight-source.rst
@@ -2,33 +2,26 @@
OpenDaylight Build
==================
-To build OpenDaylight, use of a template override
-`opendaylight-template-overrides.j2` is needed.
-The template override enables OpenDaylight use
-with OpenStack by installing required networking-odl
-plugin in neutron-server container.
-
-If you wish to install a different version of OpenDaylight
-then distro packages, use a source build (in most cases this is
-a prebuilt binary package).
+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 Containers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- For source builds append the following to kolla-build.conf,
- selecting the version of OpenDaylight to use for your source build.
-
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 (source or binary) by executing the following command:
+Build the container by executing the following command:
::
- kolla-build --template-override contrib/template-override/opendaylight-template-overrides.j2 opendaylight
+ kolla-build --type source --template-override contrib/template-override/opendaylight-template-overrides.j2 opendaylight