diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 18:08:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 18:08:44 +0000 |
| commit | 95191bcc209fa683ce2f2b038a1c6e3d55bcd5fc (patch) | |
| tree | 80af6b096372bc6b087777774a540e0dcc89061d | |
| parent | 632d8da9fd7449a9bb0c45fec8c75f5b8bfa7263 (diff) | |
| parent | 101fc2d7f8123e1f3e5abb4b369249103abfd9a2 (diff) | |
| download | kolla-95191bcc209fa683ce2f2b038a1c6e3d55bcd5fc.tar.gz kolla-95191bcc209fa683ce2f2b038a1c6e3d55bcd5fc.zip | |
Merge "Install neutron-fwaas plugin in neutron-base"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 7ea2b585d..71cad931a 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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 %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 467781468..932f9fa1a 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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/' |