diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-14 04:43:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-14 04:43:29 +0000 |
| commit | 0bf00b6fbcbe15af989bb0f841de3a627f95287b (patch) | |
| tree | 1696dfc065347e7853da24ec407e5b711d39b738 /docker/neutron | |
| parent | f16e410542db39472a7672b4cb9b09883db94930 (diff) | |
| parent | 49ff6d0544e86c702258fdc3ed95b961a217c503 (diff) | |
| download | kolla-0bf00b6fbcbe15af989bb0f841de3a627f95287b.tar.gz kolla-0bf00b6fbcbe15af989bb0f841de3a627f95287b.zip | |
Merge "Drop deprecated image neutron-sfc-agent"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/neutron/neutron-sfc-agent/extend_start.sh | 8 |
2 files changed, 0 insertions, 23 deletions
diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 deleted file mode 100644 index 4210483c8..000000000 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ /dev/null @@ -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 diff --git a/docker/neutron/neutron-sfc-agent/extend_start.sh b/docker/neutron/neutron-sfc-agent/extend_start.sh deleted file mode 100644 index d721b4d7b..000000000 --- a/docker/neutron/neutron-sfc-agent/extend_start.sh +++ /dev/null @@ -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 |