diff options
| author | Thomas O'Neill <thomas.oneill@eu.clara.net> | 2017-03-08 11:27:02 +0000 |
|---|---|---|
| committer | Thomas O'Neill <thomas.oneill@eu.clara.net> | 2017-03-15 11:26:45 +0000 |
| commit | f0c87fc343258411d0cd5894d33b94fee5e48fa4 (patch) | |
| tree | 566c0eb59180b8a9e1e1d44b09f271e97cf7003e | |
| parent | 0de503a81dc9eec672d9dea98524773edc6dbbd8 (diff) | |
| download | kolla-f0c87fc343258411d0cd5894d33b94fee5e48fa4.tar.gz kolla-f0c87fc343258411d0cd5894d33b94fee5e48fa4.zip | |
Add neutron-bgp-dragent service.
Added neutron-bgp-dragent Dockerfile.
Updated kolla/common/config.py with necessary sources.
Implements: blueprint neutron-bgp-dragent
Change-Id: If7f5c80eb10a1c418785d9c659ae18bfecfcfe33
| -rw-r--r-- | docker/neutron/neutron-bgp-dragent/Dockerfile.j2 | 36 | ||||
| -rwxr-xr-x | kolla/common/config.py | 16 | ||||
| -rw-r--r-- | releasenotes/notes/add-neutron-bgp-dragent-c831d5ec9a130937.yaml | 3 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
4 files changed, 53 insertions, 4 deletions
diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 new file mode 100644 index 000000000..525258b9f --- /dev/null +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -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 diff --git a/kolla/common/config.py b/kolla/common/config.py index c47c3c660..ec0fc1963 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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/' diff --git a/releasenotes/notes/add-neutron-bgp-dragent-c831d5ec9a130937.yaml b/releasenotes/notes/add-neutron-bgp-dragent-c831d5ec9a130937.yaml new file mode 100644 index 000000000..b3ba6f8fe --- /dev/null +++ b/releasenotes/notes/add-neutron-bgp-dragent-c831d5ec9a130937.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add image for neutron-bgp-dragent container diff --git a/tests/test_build.py b/tests/test_build.py index 491637e5b..034691bd2 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -74,6 +74,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase): "kuryr-base", "manila-data", "monasca-base", + "neutron-bgp-dragent", "neutron-sfc-agent", "searchlight-base", "senlin-base", @@ -150,6 +151,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): "kuryr-base", "manila-data", "monasca-base", + "neutron-bgp-dragent", "neutron-sfc-agent", "searchlight-base", "senlin-base", |
