diff options
| author | Tim Rozet <trozet@redhat.com> | 2017-05-24 14:38:01 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-06-02 14:06:45 -0400 |
| commit | 08edd6de056fbb05ccb99e5b9bb553dda2503b99 (patch) | |
| tree | 51ae2a46c6348203f9d9fa2a813e68ad8a0c1fb0 | |
| parent | 02f136025c085ab57520e49f307b04f3f16957b0 (diff) | |
| download | kolla-08edd6de056fbb05ccb99e5b9bb553dda2503b99.tar.gz kolla-08edd6de056fbb05ccb99e5b9bb553dda2503b99.zip | |
Adds opendaylight specific neutron-server container
We do not want to break base neutron-server container by adding
extensions that may cause DB upgrade failures, etc. Therefore it is
better to create a specific ODL neutron-server container which can use
neutron-server as its base and then contain these additional SDN related
packages.
Change-Id: I610b07a3c2bcf1c3288f76112a08b81c50e06913
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 35 | ||||
| -rwxr-xr-x | kolla/common/config.py | 14 | ||||
| -rw-r--r-- | releasenotes/notes/add-neutron-server-opendaylight-bf8407e0b91059c4.yaml | 3 |
3 files changed, 51 insertions, 1 deletions
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 new file mode 100644 index 000000000..4c1581b4b --- /dev/null +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -0,0 +1,35 @@ +FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +USER root + +{% block neutron_server_opendaylight_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% set neutron_server_opendaylight_packages = [ + 'python-networking-odl', + 'python-networking-bgpvpn', + 'python-networking-l2gw', + 'python-networking-sfc' + ] %} + +{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }} + +{% elif install_type == 'source' %} + +ADD plugins-archive / + +{% set neutron_server_opendaylight_plugins_pip_packages = [ + '/plugins/*' +] %} + +RUN {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages | customizable("pip_packages")) }}; + +{% endif %} + +{% block neutron_server_opendaylight_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER neutron diff --git a/kolla/common/config.py b/kolla/common/config.py index 90fbc2777..dfaddce66 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -490,10 +490,22 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/neutron-lbaas/' 'neutron-lbaas-master.tar.gz')}, - 'neutron-server-plugin-networking-odl': { + 'neutron-server-opendaylight-plugin-networking-odl': { 'type': 'url', 'location': ('$tarballs_base/networking-odl/' 'networking-odl-master.tar.gz')}, + 'neutron-server-opendaylight-plugin-networking-bgpvpn': { + 'type': 'url', + 'location': ('$tarballs_base/networking-bgpvpn/' + 'networking-bgpvpn-master.tar.gz')}, + 'neutron-server-opendaylight-plugin-networking-l2gw': { + 'type': 'url', + 'location': ('$tarballs_base/networking-l2gw/' + 'networking-l2gw-master.tar.gz')}, + 'neutron-server-opendaylight-plugin-networking-sfc': { + 'type': 'url', + 'location': ('$tarballs_base/networking-sfc/' + 'networking-sfc-master.tar.gz')}, 'neutron-server-plugin-neutron-dynamic-routing': { 'type': 'url', 'location': ('$tarballs_base/neutron-dynamic-routing/' diff --git a/releasenotes/notes/add-neutron-server-opendaylight-bf8407e0b91059c4.yaml b/releasenotes/notes/add-neutron-server-opendaylight-bf8407e0b91059c4.yaml new file mode 100644 index 000000000..f78119860 --- /dev/null +++ b/releasenotes/notes/add-neutron-server-opendaylight-bf8407e0b91059c4.yaml @@ -0,0 +1,3 @@ +--- +features: + - Adds OpenDaylight specific Neutron Server container. |