diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-08 10:18:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-08 10:18:38 +0000 |
| commit | f35bdeeb2bf5b5856cced8e82b8c8e8a539509b9 (patch) | |
| tree | b02f413b9b0a959f0631061ae03f043a0878f5b7 /docker | |
| parent | b121d3cf3bf4120e32ac6ea67d463367b4c66889 (diff) | |
| parent | acb13dc5b96c220636daf2f2080119c59842604b (diff) | |
| download | kolla-f35bdeeb2bf5b5856cced8e82b8c8e8a539509b9.tar.gz kolla-f35bdeeb2bf5b5856cced8e82b8c8e8a539509b9.zip | |
Merge "Install plugins in neutron-server if available"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index a214701b5..aa6f64e60 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,7 +1,11 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +ADD plugins-archive / COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && if [[ "$(ls /plugins)" ]]; then \ + pip --no-cache-dir install -c requirements/upper-constraints.txt /plugins/*; \ + fi {{ include_footer }} |