diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-07-12 12:27:00 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-07-12 12:29:05 +0200 |
| commit | b76bb49dfdbe106fc5707a56573d145553f59574 (patch) | |
| tree | 8e6ada9c6dc380bc448d7b6282b8538f17bf24bc | |
| parent | 7da9d5c02047532e57e7630428304e2be2561171 (diff) | |
| download | kolla-b76bb49dfdbe106fc5707a56573d145553f59574.tar.gz kolla-b76bb49dfdbe106fc5707a56573d145553f59574.zip | |
Fix opendaylight custom distribution
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
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 5 | ||||
| -rw-r--r-- | doc/template-override/opendaylight-source.rst | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index f6e1777ba..3e2e70085 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -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 %} diff --git a/doc/template-override/opendaylight-source.rst b/doc/template-override/opendaylight-source.rst index 36b0af3d5..c34b920c6 100644 --- a/doc/template-override/opendaylight-source.rst +++ b/doc/template-override/opendaylight-source.rst @@ -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 |