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

3 files changed, 11 insertions, 21 deletions

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 01ca2f4dd..984717759 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -20,6 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-neutron-lbaas',
             'openstack-neutron-ml2',
             'openvswitch',
+            'python-networking-sfc',
             'python-openvswitch',
             'python2-oslo-vmware'
         ] %}
@@ -33,6 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-plugin-ml2',
             'neutron-server',
             'openvswitch-switch',
+            'python-networking-sfc',
             'python-openvswitch',
             'python-oslo.vmware'
         ] %}
@@ -47,6 +49,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-plugin-ml2',
             'neutron-server',
             'openvswitch-switch',
+            'python-networking-sfc',
             'python-openvswitch',
             'python-oslo.vmware'
         ] %}
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
diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
index 9fb4e7c0f..02b5e89ad 100644
--- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
@@ -5,27 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-        {% set networking_sfc_agent = ['python-networking-sfc'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
-        {% set networking_sfc_agent = ['python-networking-sfc'] %}
-    {% endif %}
-    {{ macros.install_packages(networking_sfc_agent | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-ADD neutron-sfc-agent-archive /neutron-sfc-agent-source
-
-{% set neutron_sfc_agent_pip_packages = [
-    '/neutron-sfc-agent'
-] %}
-
-RUN ln -s neutron-sfc-agent-source/* neutron-sfc-agent \
-    && {{ macros.install_pip(neutron_sfc_agent_pip_packages | customizable("pip_packages")) }}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
 RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start