openstack
/
kolla
Code Issues Proposed changes

Remove neutron-server-opendaylight image 

In [1] we have removed opendaylight image, but left neutron-server-opendaylight
image.

[1]: https://review.opendev.org/#/c/739446/

Change-Id: Iae312e24a4ff9ab79979328abac3410fbb1a3cc2
This commit is contained in:
Michal Nasiadka 2020-07-23 10:58:10 +02:00 committed by Mark Goddard
parent acd0d4bf20
commit 1781af8b46
4 changed files with 4 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
docker/neutron/neutron-server-opendaylight/Dockerfile.j2
View File

@ -1,62 +0,0 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}
USER root
{% block neutron_server_opendaylight_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_server_opendaylight_packages = [
'python3-networking-bgpvpn',
'python3-networking-bgpvpn-heat',
'python3-networking-l2gw',
'python3-networking-odl'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_server_opendaylight_packages = [
'python3-networking-bgpvpn',
'python3-networking-l2gw',
'python3-networking-odl'
] %}
{% endif %}
{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_arch not in ['x86_64'] %}
{% if base_package_type == 'rpm' %}
{% set neutron_server_opendaylight_packages = [
'libjpeg-devel'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_server_opendaylight_packages = [
'libjpeg-dev'
] %}
{% endif %}
{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
{% endif %}
ADD plugins-archive /
{% set neutron_server_opendaylight_plugins_pip_packages = [
'/plugins/*'
] %}
RUN if [ "$(ls /plugins)" ]; then \
sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \
&& {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \
fi
{% endif %}
{% block neutron_server_opendaylight_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER neutron

17
kolla/common/config.py
View File

@ -63,7 +63,6 @@ _PROFILE_OPTS = [
'logstash',
'mariadb',
'memcached',
'opendaylight',
'openvswitch',
'ptp',
'qdrouterd',
@ -582,22 +581,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'
'neutron-dynamic-routing-${openstack_branch}.tar.gz')},
'neutron-server-opendaylight-plugin-networking-odl': {
'type': 'url',
'location': ('$tarballs_base/openstack/networking-odl/'
'networking-odl-${openstack_branch}.tar.gz')},
'neutron-server-opendaylight-plugin-networking-bgpvpn': {
'type': 'url',
'location': ('$tarballs_base/openstack/networking-bgpvpn/'
'networking-bgpvpn-${openstack_branch}.tar.gz')},
'neutron-server-opendaylight-plugin-networking-l2gw': {
'type': 'url',
'location': ('$tarballs_base/openstack/networking-l2gw/'
'networking-l2gw-${openstack_branch}.tar.gz')},
'neutron-server-opendaylight-plugin-networking-sfc': {
'type': 'url',
'location': ('$tarballs_base/openstack/networking-sfc/'
'networking-sfc-${openstack_branch}.tar.gz')},
'neutron-server-plugin-neutron-dynamic-routing': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-dynamic-routing/'

1
kolla/image/build.py
View File

@ -166,7 +166,6 @@ UNBUILDABLE_IMAGES = {
"ec2-api",
"heat-all",
"ironic-neutron-agent",
"neutron-server-opendaylight",
"nova-serialproxy",
"novajoin-base",
"senlin-conductor", # no binary package

4
releasenotes/notes/remove-neutron-server-opendaylight-6cacd3936c0dc91e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``neutron-server-opendaylight`` image has been removed.