diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2017-09-27 12:18:21 +0100 |
|---|---|---|
| committer | Paul Bourke (pbourke) <paul.bourke@oracle.com> | 2017-09-27 13:27:34 +0000 |
| commit | f44366c722bc594559167cf92afe8f47d08a215a (patch) | |
| tree | 538ee414ab9d806a08f9e451afeee52354599cd6 | |
| parent | 2ef0bd51a93a3d0d5e963824a7e5fb2ea556239e (diff) | |
| download | kolla-f44366c722bc594559167cf92afe8f47d08a215a.tar.gz kolla-f44366c722bc594559167cf92afe8f47d08a215a.zip | |
Make plugins optional in opendaylight & ovn
Only attempt to install plugins in these images if the user has enabled
them.
Change-Id: I78dd929b0c43b577e443a8226a8d5b9a9c868626
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | 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 %} |