openstack/kolla
Code Issues Proposed changes

Merge "Cleanup opendaylight-template-overrides"

Browse Source
This commit is contained in:
Jenkins 2017-08-21 08:54:05 +00:00 committed by Gerrit Code Review
commit 43c70fed42
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/template-override/opendaylight-template-overrides.j2
View File

@ -1,10 +1,5 @@
{% extends parent_template %} {% extends parent_template %}
{% block neutron_server_footer %}
ADD plugins-archive /
RUN pip --no-cache-dir install /plugins/*
{% endblock %}
{% block opendaylight_install %} {% block opendaylight_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set opendaylight_packages = ['java-1.8.0-openjdk'] %} {% set opendaylight_packages = ['java-1.8.0-openjdk'] %}

23
doc/template-override/opendaylight-source.rst
View File

@ -2,33 +2,26 @@
OpenDaylight Build OpenDaylight Build
================== ==================
To build OpenDaylight, use of a template override The `opendaylight-template-overrides.j2` template override shows how to build
`opendaylight-template-overrides.j2` is needed. an OpenDaylight container image with a different version than the one packaged
The template override enables OpenDaylight use with the distro.
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).
Building OpenDaylight Containers 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 kolla-build.conf
________________ ________________
Point to the desired version of OpenDaylight in `kolla-build.conf`:
.. code-block:: console .. code-block:: console
[opendaylight] [opendaylight]
type = url 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 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