openstack/kolla
Code Issues Proposed changes

neutron-base: remove bashisms

Browse Source 
Use [ instead of [[.

This will solve the following issue:

Change-Id: I1153a5146ca8b08dd1ad732b60d8d4bce8e060ab
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:/bin/sh: 1: [[: not found
INFO:kolla.common.utils.neutron-base:
This commit is contained in:
Christian Berendt 2018-10-12 13:20:27 +02:00
parent 649094f9d2
commit 441064147a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -144,7 +144,7 @@ RUN ln -s neutron-base-source/* neutron \
&& if [ "$(ls /plugins)" ]; then \ && if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_base_plugins_pip_packages) }} \ {{ macros.install_pip(neutron_base_plugins_pip_packages) }} \
&& for neutron_plugins in $(ls /plugins); do \ && for neutron_plugins in $(ls /plugins); do \
if [[ -d "/plugins/$neutron_plugins/etc/neutron/rootwrap.d" ]]; then \ if [ -d "/plugins/$neutron_plugins/etc/neutron/rootwrap.d" ]; then \
cp /plugins/$neutron_plugins/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d; \ cp /plugins/$neutron_plugins/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d; \
fi; \ fi; \
done; \ done; \