From fb003d66ceb46f35675f7e209b18272717841e4c Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 2 May 2017 13:41:46 +0200 Subject: Add sfc plugin into neutron-base image Neutron-server and openvswitch-agent images consume sfc plugin code to run sfc services. This change adds db sync for sfc plugin. Also move sfc code into neutron-base so other services can make use of the plugin. Change-Id: I60ba1333231a4ae38a041d41e551f7d74fe15e3b Closes-Bug: #1664493 --- docker/neutron/neutron-server/extend_start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docker/neutron/neutron-server') diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 1d3a31479..a027bb786 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -7,6 +7,14 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi +# Bootstrap and exit if KOLLA_BOOTSTRAP and NEUTRON_SFC_ENABLED variables are set. +# This catches all cases of the KOLLA_BOOTSTRAP and NEUTRON_SFC_ENABLED variable +# being set, including empty. +if [[ "${!NEUTRON_SFC_BOOTSTRAP[@]}" ]]; then + neutron-db-manage --subproject networking-sfc --config-file /etc/neutron/neutron.conf upgrade head + exit 0 +fi + # Migrate database and exit if KOLLA_UPGRADE variable is set. This catches all cases # of the KOLLA_UPGRADE variable being set, including empty. if [[ "${!KOLLA_UPGRADE[@]}" ]]; then -- cgit v1.2.3