diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2018-11-02 22:31:16 +0100 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2018-11-02 22:36:20 +0100 |
| commit | 49ff6d0544e86c702258fdc3ed95b961a217c503 (patch) | |
| tree | 0c6fe48d08d39d5026351f2eff90b232e460193a /docker | |
| parent | 188c46cc4a89c12ea8c1d5d851b295f2b70ea283 (diff) | |
| download | kolla-49ff6d0544e86c702258fdc3ed95b961a217c503.tar.gz kolla-49ff6d0544e86c702258fdc3ed95b961a217c503.zip | |
Drop deprecated image neutron-sfc-agent
Change-Id: Ie81b9c5f44d209209b65ceea446d4abc9f533f91
Diffstat (limited to 'docker')
| -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 |