diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-26 15:29:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-26 15:29:07 +0000 |
| commit | 51cb51bb66b4d4dd2a284620a7bcaa599eec0f92 (patch) | |
| tree | 38dbe5c71e0796a66565e6b2dfcae5ba19e7522d | |
| parent | 99775a7f6849ecb7c64d7966388c4c72bb8564e0 (diff) | |
| parent | b76bb49dfdbe106fc5707a56573d145553f59574 (diff) | |
| download | kolla-51cb51bb66b4d4dd2a284620a7bcaa599eec0f92.tar.gz kolla-51cb51bb66b4d4dd2a284620a7bcaa599eec0f92.zip | |
Merge "Fix opendaylight custom distribution"
| -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 |