diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-11-20 11:47:46 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-11-30 10:01:06 +0000 |
| commit | acb13dc5b96c220636daf2f2080119c59842604b (patch) | |
| tree | 9c72be125520665f5ceeda56a401eb9420df7b1e | |
| parent | 2581e3099c14640a860c318aa3c49fa63d32adc6 (diff) | |
| download | kolla-acb13dc5b96c220636daf2f2080119c59842604b.tar.gz kolla-acb13dc5b96c220636daf2f2080119c59842604b.zip | |
Install plugins in neutron-server if available
Implements: blueprint neutron-third-party-plugins
Change-Id: I56c56bacd2f06c120b14b00c0b97dd4e39c0afc0
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | etc/kolla/kolla-build.conf | 11 |
2 files changed, 16 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 }} diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf index baaa29ff9..1246a32af 100644 --- a/etc/kolla/kolla-build.conf +++ b/etc/kolla/kolla-build.conf @@ -122,6 +122,17 @@ location = http://tarballs.openstack.org/murano/murano-master.tar.gz type = url location = http://tarballs.openstack.org/neutron/neutron-master.tar.gz +# The following two blocks show how plugins can be installed into supported +# images. Note, configuration will need to be provided via Ansible. +# +#[neutron-server-plugin-networking-arista] +#type = url +#location = http://tarballs.openstack.org/networking-arista/networking-arista-master.tar.gz + +#[neutron-server-plugin-networking-brocade] +#type = url +#location = http://tarballs.openstack.org/networking-brocade/networking-brocade-master.tar.gz + [nova-base] type = url location = http://tarballs.openstack.org/nova/nova-master.tar.gz |