4 files changed, 5 insertions, 11 deletions
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 8dbd6548a..bdb15a340 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,9 +1,9 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY start.sh /
 COPY ovs_ensure_configured.sh /opt/kolla/
 
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start /opt/kolla/ovs_ensure_configured.sh
 
 {{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
new file mode 100644
index 000000000..e2fc55465
--- /dev/null
+++ b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+modprobe openvswitch
diff --git a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
index c39d64ff7..c39d64ff7 100755..100644
--- a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
+++ b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
diff --git a/docker/openvswitch/openvswitch-vswitchd/start.sh b/docker/openvswitch/openvswitch-vswitchd/start.sh
deleted file mode 100755
index b72ba5a2e..000000000
--- a/docker/openvswitch/openvswitch-vswitchd/start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-modprobe openvswitch
-
-exec $CMD