Merge "Drop deprecated image neutron-sfc-agent"
This commit is contained in:
commit
0bf00b6fbc
@ -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
|
|
@ -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
|
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
The neutron-sfc-agent was removed. It was deprecated and marked for
|
||||||
|
removal during Queens release.
|
Loading…
Reference in New Issue
Block a user