openstack/kolla
Code Issues Proposed changes

Merge "Fix opendaylight custom distribution"

Browse Source
This commit is contained in:
Jenkins 2017-07-26 15:29:07 +00:00 committed by Gerrit Code Review
commit 51cb51bb66
2 changed files with 1 additions and 10 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

@ -14,9 +14,6 @@ RUN pip --no-cache-dir install /plugins/*
{{ macros.install_packages(opendaylight_packages | customizable("packages")) }}
{% if opendaylight_distro is not defined %}
{% set opendaylight_distro = 'distribution-karaf-0.6.0-Carbon' %}
{% endif %}
ADD opendaylight-archive /opendaylight
RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight
RUN ln -s /opendaylight/* /opt/opendaylight
{% endblock %}

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

@ -19,16 +19,10 @@ Building OpenDaylight Containers
- For source builds append the following to kolla-build.conf,
selecting the version of OpenDaylight to use for your source build.
- Change `opendaylight_distro` to match the folder where OpenDaylight
build resides. For example, if using prebuilt archive from OpenDaylight
downloads `distribution-karaf-0.6.0-Carbon.tar.gz` becomes
`distribution-karaf-0.6.0-Carbon`.
kolla-build.conf
________________
.. code-block:: console
opendaylight_distro = distribution-karaf-0.6.0-Carbon
[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