openstack/kolla
Code Issues Proposed changes

Fix opendaylight custom distribution

Browse Source 
opendaylight_distro is not passed to Dockerfile
while image building.
This change removes this variable and change the
symbolic link with the distribution passed to
opendaylight location in kolla-build.conf

Change-Id: I7c00a8736a7a5e7c317065438cac1b193466615c
Closes-Bug: #1703774
This commit is contained in:
Eduardo Gonzalez 2017-07-12 12:27:00 +02:00
parent 7da9d5c020
commit b76bb49dfd
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")) }} {{ 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 ADD opendaylight-archive /opendaylight
RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight RUN ln -s /opendaylight/* /opt/opendaylight
{% endblock %} {% 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, - For source builds append the following to kolla-build.conf,
selecting the version of OpenDaylight to use for your source build. 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 kolla-build.conf
________________ ________________
.. code-block:: console .. code-block:: console
opendaylight_distro = distribution-karaf-0.6.0-Carbon
[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