openstack
/
kolla
Code Issues Proposed changes

Merge "Install plugins in neutron-server if available"

This commit is contained in:
Jenkins 2015-12-08 10:18:38 +00:00 committed by Gerrit Code Review
parent b121d3cf3b acb13dc5b9
commit f35bdeeb2b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -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 }}

11
etc/kolla/kolla-build.conf
View File

@ -126,6 +126,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