From b76bb49dfdbe106fc5707a56573d145553f59574 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Wed, 12 Jul 2017 12:27:00 +0200 Subject: 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 --- contrib/template-override/opendaylight-template-overrides.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'contrib/template-override') 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 %} -- cgit v1.2.3