Remove start-ovsdb-server script from openvswitch-db-server

This script is not used by TripleO, and Kolla Ansible replaces it with a
templated script.

Change-Id: If4418ad1eb7e5b5029a226c3dd65285b23790bd1

2 files changed, 1 insertions, 33 deletions

diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index 9f63aeef5..d888d94f5 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -5,10 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
-COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server
 RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured \
-              /usr/local/bin/kolla_openvswitch_extend_start \
-              /usr/local/bin/start-ovsdb-server
+              /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh b/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh
deleted file mode 100755
index bb8bba65e..000000000
--- a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# NOTE: (sbezverk) ovs_bridge and ovs_ext_intf variables get initialized only when
-# this script is executed for kubernetes deployment. With Ansible deployment, only
-# ovsdb-server gets launched and then the following workflow step will create
-# an external bridge and plug an external interface. With Kubernetes we want to
-# leverage its dynamic nature of automatic scaling up and down. It means all
-# activities related to creating initial bridge, plugging external interface
-# must be done by DaemonSet launched container.
-
-ovsdb_ip=$1
-ovs_bridge=$2
-ovs_ext_intf=$3
-
-# NOTE: (sbezverk) The reason for introducing this script is to be able
-# to launch ovsdb-server and to create the initial external bridge in one step.
-# It is required in order to be able to use DaemonSet.
-
-if [ ! -e $ovs_bridge  ] && [ ! -e $ovs_ext_intf  ]; then
-# NOTE: (sbezverk) This part is executed only by kubernetes deployment.
-# Creating external bridge
-    /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-br $ovs_bridge"
-# Plug the external interface into the external bridge.
-    /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db --remote=punix:/var/run/openvswitch/db.sock --run="ovs-vsctl --no-wait --db=unix:/var/run/openvswitch/db.sock add-port $ovs_bridge $ovs_ext_intf"
-# Run ovsdb server process
-    /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/var/run/openvswitch/db.sock --remote=ptcp:6640 --log-file=/var/log/kolla/openvswitch/ovsdb-server.log
-else
-# NOTE: (sbezverk) This part is executed only by kolla-ansible deployment.
-    /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --pidfile=/var/run/openvswitch/ovs-vswitchd.pid --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:$ovsdb_ip --log-file=/var/log/kolla/openvswitch/ovsdb-server.log
-fi