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>
This commit is contained in:
Tim Rozet 2017-05-24 14:38:01 -04:00
parent 02f136025c
commit 08edd6de05
3 changed files with 51 additions and 1 deletions

View File

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

View File

@ -490,10 +490,22 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron-lbaas/' 'location': ('$tarballs_base/neutron-lbaas/'
'neutron-lbaas-master.tar.gz')}, 'neutron-lbaas-master.tar.gz')},
'neutron-server-plugin-networking-odl': { 'neutron-server-opendaylight-plugin-networking-odl': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/networking-odl/' 'location': ('$tarballs_base/networking-odl/'
'networking-odl-master.tar.gz')}, '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': { 'neutron-server-plugin-neutron-dynamic-routing': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/neutron-dynamic-routing/' 'location': ('$tarballs_base/neutron-dynamic-routing/'

View File

@ -0,0 +1,3 @@
---
features:
- Adds OpenDaylight specific Neutron Server container.