diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 08:54:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 08:54:59 +0000 |
| commit | 1e55ee77ca00a38d0175aaeed36837b37a4e0dd3 (patch) | |
| tree | 4a40579bebeced4fa219e3208f52f9cab8e90560 /docker/openvswitch/ovs-vswitchd | |
| parent | cb752f1e57a509c6cb990c500b9557575073fa5d (diff) | |
| parent | 94ea43fa555fac20c15cdb4f4214af20913b6270 (diff) | |
| download | kolla-1e55ee77ca00a38d0175aaeed36837b37a4e0dd3.tar.gz kolla-1e55ee77ca00a38d0175aaeed36837b37a4e0dd3.zip | |
Merge "Replace config-external - openvswitch"
Diffstat (limited to 'docker/openvswitch/ovs-vswitchd')
| -rwxr-xr-x | docker/openvswitch/ovs-vswitchd/start.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/docker/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/ovs-vswitchd/start.sh index 3ec2c26b2..792954bb4 100755 --- a/docker/openvswitch/ovs-vswitchd/start.sh +++ b/docker/openvswitch/ovs-vswitchd/start.sh @@ -1,19 +1,12 @@ #!/bin/bash -LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log" -DB_FILE="/etc/openvswitch/conf.db" -UNIXSOCK_DIR="/var/run/openvswitch" -UNIXSOCK="${UNIXSOCK_DIR}/db.sock" - -CMD="/usr/sbin/ovs-vswitchd" -ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file=${LOG_FILE}" +set -o errexit # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) modprobe openvswitch -mkdir -p "${UNIXSOCK_DIR}" -exec $CMD $ARGS +exec $CMD |