openstack
/
kolla
Code Issues Proposed changes

Merge "Add neutron-bgp-dragent service."

This commit is contained in:
Jenkins 2017-03-15 15:08:36 +00:00 committed by Gerrit Code Review
parent 53668615e0 f0c87fc343
commit 5397586ae4
4 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
docker/neutron/neutron-bgp-dragent/Dockerfile.j2 Normal file
View File

@ -0,0 +1,36 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% block neutron_bgp_dragent_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set neutron_bgp_dragent_packages = [
'neutron-bgp-dragent'
] %}
{% endif %}
{{ macros.install_packages(neutron_bgp_dragent_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source
{% set neutron_bgp_dragent_pip_packages = [
'/neutron_dynamic_routing'
] %}
RUN ln -s neutron-bgp-dragent-source/* neutron_dynamic_routing \
&& {{ macros.install_pip(neutron_bgp_dragent_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block neutron_bgp_dragent_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER neutron

16
kolla/common/config.py
View File

@ -443,22 +443,30 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/networking-generic-switch/'
'networking-generic-switch-master.tar.gz')},
'neutron-bgp-dragent': {
'type': 'url',
'location': ('$tarballs_base/neutron-dynamic-routing/'
'neutron-dynamic-routing-master.tar.gz')},
'neutron-lbaas-agent': {
'type': 'url',
'location': ('$tarballs_base/neutron-lbaas/'
'neutron-lbaas-master.tar.gz')},
'neutron-server-plugin-neutron-dynamic-routing': {
'type': 'url',
'location': ('$tarballs_base/neutron-dynamic-routing/'
'neutron-dynamic-routing-master.tar.gz')},
'neutron-server-plugin-neutron-lbaas': {
'type': 'url',
'location': ('$tarballs_base/neutron-lbaas/'
'neutron-lbaas-master.tar.gz')},
'neutron-sfc-agent': {
'type': 'url',
'location': ('$tarballs_base/networking-sfc/'
'networking-sfc-master.tar.gz')},
'neutron-server-plugin-vpnaas-agent': {
'type': 'url',
'location': ('$tarballs_base/neutron-vpnaas/'
'neutron-vpnaas-master.tar.gz')},
'neutron-sfc-agent': {
'type': 'url',
'location': ('$tarballs_base/networking-sfc/'
'networking-sfc-master.tar.gz')},
'neutron-vpnaas-agent': {
'type': 'url',
'location': ('$tarballs_base/neutron-vpnaas/'

3
releasenotes/notes/add-neutron-bgp-dragent-c831d5ec9a130937.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Add image for neutron-bgp-dragent container

2
tests/test_build.py
View File

@ -73,6 +73,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"manila-data",
"monasca-base",
"neutron-bgp-dragent",
"neutron-sfc-agent",
"searchlight-base",
"senlin-base",
@ -186,6 +187,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"kuryr-base",
"manila-data",
"monasca-base",
"neutron-bgp-dragent",
"neutron-sfc-agent",
"searchlight-base",
"senlin-base",