diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index b4c864b9d6..eeb76c7821 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -1,10 +1,5 @@ {% extends parent_template %} -{% block neutron_server_footer %} -ADD plugins-archive / -RUN pip --no-cache-dir install /plugins/* -{% endblock %} - {% block opendaylight_install %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set opendaylight_packages = ['java-1.8.0-openjdk'] %} diff --git a/doc/template-override/opendaylight-source.rst b/doc/template-override/opendaylight-source.rst index c34b920c6a..344a0de076 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