From dd2e2ad8e22d09ce24eadf92d8c66cdde85407a5 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <me@coolsvap.net>
Date: Thu, 23 Jul 2015 07:54:46 +0000
Subject: Make variables in OVS container configurable

Change-Id: I8d216ca20c97428e3b27d48d0a5249282dcb8c18
Closes-Bug: #1468509
---
 .../common/openvswitch/ovs-db-server/config-internal.sh   | 15 +++++++--------
 docker/common/openvswitch/ovs-vswitchd/config-internal.sh | 11 ++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'docker/common/openvswitch')

diff --git a/docker/common/openvswitch/ovs-db-server/config-internal.sh b/docker/common/openvswitch/ovs-db-server/config-internal.sh
index a2b4d6c8f..f233418a7 100755
--- a/docker/common/openvswitch/ovs-db-server/config-internal.sh
+++ b/docker/common/openvswitch/ovs-db-server/config-internal.sh
@@ -2,15 +2,14 @@
 
 set -o errexit
 
-LOG_FILE="/var/log/openvswitch/ovsdb-server.log"
-DB_FILE="/etc/openvswitch/conf.db"
-UNIXSOCK_DIR="/var/run/openvswitch"
-UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
+check_required_vars OVS_DB_FILE \
+                    OVS_UNIXSOCK
 
-mkdir -p "${UNIXSOCK_DIR}"
 
-if [[ ! -e "${DB_FILE}" ]]; then
-    ovsdb-tool create "${DB_FILE}"
+mkdir -p "$(dirname $OVS_UNIXSOCK)"
+
+if [[ ! -e "${OVS_DB_FILE}" ]]; then
+    ovsdb-tool create "${OVS_DB_FILE}"
 fi
 
-exec ovsdb-server $DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${UNIXSOCK}" --log-file="${LOG_FILE}"
+exec ovsdb-server $OVS_DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${OVS_UNIXSOCK}" --log-file="${OVS_LOG_FILE}"
diff --git a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh
index 1a18ab958..2e42f7029 100755
--- a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh
+++ b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh
@@ -2,14 +2,11 @@
 
 set -o errexit
 
-modprobe openvswitch
+check_required_vars OVS_UNIXSOCK
 
-LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log"
-DB_FILE="/etc/openvswitch/conf.db"
-UNIXSOCK_DIR="/var/run/openvswitch"
-UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
+modprobe openvswitch
 
-mkdir -p "${UNIXSOCK_DIR}"
+mkdir -p "$(dirname $OVS_UNIXSOCK)"
 
-exec ovs-vswitchd unix:"${UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${LOG_FILE}"
+exec ovs-vswitchd unix:"${OVS_UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${OVS_LOG_FILE}"
 
-- 
cgit v1.2.3