From f44366c722bc594559167cf92afe8f47d08a215a Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 27 Sep 2017 12:18:21 +0100 Subject: Make plugins optional in opendaylight & ovn Only attempt to install plugins in these images if the user has enabled them. Change-Id: I78dd929b0c43b577e443a8226a8d5b9a9c868626 --- docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 4 +++- docker/neutron/neutron-server-ovn/Dockerfile.j2 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index 354596f36..ad317de2f 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -24,7 +24,9 @@ ADD plugins-archive / '/plugins/*' ] %} -RUN {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages | customizable("pip_packages")) }}; +RUN if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages | customizable("pip_packages")) }}; \ + fi {% endif %} diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2 index ed51650ad..06b5688ed 100644 --- a/docker/neutron/neutron-server-ovn/Dockerfile.j2 +++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2 @@ -22,7 +22,9 @@ ADD plugins-archive / '/plugins/*' ] %} -RUN {{ macros.install_pip(neutron_server_ovn_plugins_pip_packages | customizable("pip_packages")) }} +RUN if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(neutron_server_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \ + fi {% endif %} -- cgit v1.2.3