From dd2e2ad8e22d09ce24eadf92d8c66cdde85407a5 Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Thu, 23 Jul 2015 07:54:46 +0000 Subject: Make variables in OVS container configurable Change-Id: I8d216ca20c97428e3b27d48d0a5249282dcb8c18 Closes-Bug: #1468509 --- docker/common/openvswitch/ovs-vswitchd/config-internal.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'docker/common/openvswitch/ovs-vswitchd') 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