openstack
/
kolla
Code Issues Proposed changes

Merge "Adds opendaylight specific neutron-server container"

This commit is contained in:
Jenkins 2017-06-07 13:44:29 +00:00 committed by Gerrit Code Review
parent b1a6e27f6d 08edd6de05
commit 87c2a058eb
3 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
docker/neutron/neutron-server-opendaylight/Dockerfile.j2 Normal file
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

14
kolla/common/config.py
View File

@ -496,10 +496,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/'

3
releasenotes/notes/add-neutron-server-opendaylight-bf8407e0b91059c4.yaml Normal file
View File

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