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-db-server/start.sh | |
| 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-db-server/start.sh')
| -rwxr-xr-x | docker/openvswitch/ovs-db-server/start.sh | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/ovs-db-server/start.sh index 89b2e3e92..4d3d772cc 100755 --- a/docker/openvswitch/ovs-db-server/start.sh +++ b/docker/openvswitch/ovs-db-server/start.sh @@ -1,25 +1,15 @@ #!/bin/bash - 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" - -CMD="/usr/sbin/ovsdb-server" -ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK} --log-file=${LOG_FILE}" - # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs - -mkdir -p "${UNIXSOCK_DIR}" +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) -if [[ ! -e "${DB_FILE}" ]]; then - ovsdb-tool create "${DB_FILE}" +mkdir -p "/run/openvswitch" +if [[ ! -e "/etc/openvswitch/conf.db" ]]; then + ovsdb-tool create "/etc/openvswitch/conf.db" fi -exec $CMD $ARGS +exec $CMD |