openstack/kolla
Code Issues Proposed changes

Drop deprecated image neutron-sfc-agent

Browse Source 
Change-Id: Ie81b9c5f44d209209b65ceea446d4abc9f533f91
This commit is contained in:
Christian Berendt 2018-11-02 22:31:16 +01:00
parent 188c46cc4a
commit 49ff6d0544
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/neutron/neutron-sfc-agent/Dockerfile.j2
View File

@ -1,15 +0,0 @@
# TODO(egonzalez): SFC image is deprecated and will be removed during Queens release
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block neutron_networking_sfc_agent_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
{% block neutron_sfc_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER neutron

8
docker/neutron/neutron-sfc-agent/extend_start.sh
View File

@ -1,8 +0,0 @@
#!/bin/bash
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
neutron-db-manage --subproject networking-sfc --config-file /etc/neutron/neutron.conf upgrade head
exit 0
fi

5
releasenotes/notes/remove-neutron-sfc-agent-181ec5dbc52ac1da.yaml Normal file
View File

@ -0,0 +1,5 @@
---
other:
- |
The neutron-sfc-agent was removed. It was deprecated and marked for
removal during Queens release.