openstack/kolla
Code Issues Proposed changes

Merge "Install neutron-fwaas plugin in neutron-base"

Browse Source
This commit is contained in:
Jenkins 2016-11-30 18:08:44 +00:00 committed by Gerrit Code Review
commit 95191bcc20
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ RUN mkdir -p /usr/share/neutron \
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
ADD neutron-base-archive /neutron-base-source
ADD plugins-archive /
RUN ln -s neutron-base-source/* neutron \
&& useradd --user-group neutron \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \
@ -80,7 +81,10 @@ RUN ln -s neutron-base-source/* neutron \
&& cp /neutron/etc/api-paste.ini /usr/share/neutron \
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
&& chown -R neutron: /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf \
&& if [ "$(ls /plugins)" ]; then \
pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \
fi
{% endif %}

4
kolla/common/config.py
View File

@ -262,6 +262,10 @@ SOURCES = {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron/'
'neutron-master.tar.gz')},
'neutron-base-plugin-neutron-fwaas': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-fwaas/'
'neutron-fwaas-master.tar.gz')},
'neutron-lbaas-agent': {
'type': 'url',
'location': ('http://tarballs.openstack.org/neutron-lbaas/'