mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

ovs-sandbox: Use new ovn-sb database name.

Browse Source 
Commit ec78987 (ovn: Rename "ovn" database to "ovn-sb".) changed the
name of the database, but didn't update ovs-sandbox to use this new
name.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
This commit is contained in:
Justin Pettit 2015-04-08 22:51:10 -07:00
parent 5da8207186
commit 1369720c6c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tutorial/ovs-sandbox
View File

@ -51,8 +51,8 @@ schema=
installed=false installed=false
built=false built=false
ovn=false ovn=false
ovnschema= ovnsb_schema=
ovnnbschema= ovnnb_schema=
for option; do for option; do
# This option-parsing mechanism borrowed from a Autoconf-generated # This option-parsing mechanism borrowed from a Autoconf-generated
@ -193,13 +193,13 @@ if $built; then
exit 1 exit 1
fi fi
if $ovn; then if $ovn; then
ovnschema=$srcdir/ovn/ovn.ovsschema ovnsb_schema=$srcdir/ovn/ovn-sb.ovsschema
if test ! -e "$ovnschema"; then if test ! -e "$ovnsb_schema"; then
echo >&2 'source directory not found, please use --srcdir' echo >&2 'source directory not found, please use --srcdir'
exit 1 exit 1
fi fi
ovnnbschema=$srcdir/ovn/ovn-nb.ovsschema ovnnb_schema=$srcdir/ovn/ovn-nb.ovsschema
if test ! -e "$ovnnbschema"; then if test ! -e "$ovnnb_schema"; then
echo >&2 'source directory not found, please use --srcdir' echo >&2 'source directory not found, please use --srcdir'
exit 1 exit 1
fi fi
@ -265,11 +265,11 @@ touch "$sandbox"/.conf.db.~lock~
run ovsdb-tool create conf.db "$schema" run ovsdb-tool create conf.db "$schema"
ovsdb_server_args= ovsdb_server_args=
if $ovn; then if $ovn; then
touch "$sandbox"/.ovn.db.~lock~ touch "$sandbox"/.ovnsb.db.~lock~
touch "$sandbox"/.ovnnb.db.~lock~ touch "$sandbox"/.ovnnb.db.~lock~
run ovsdb-tool create ovn.db "$ovnschema" run ovsdb-tool create ovnsb.db "$ovnsb_schema"
run ovsdb-tool create ovnnb.db "$ovnnbschema" run ovsdb-tool create ovnnb.db "$ovnnb_schema"
ovsdb_server_args="ovn.db ovnnb.db conf.db" ovsdb_server_args="ovnsb.db ovnnb.db conf.db"
fi fi
rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \
--remote=punix:"$sandbox"/db.sock $ovsdb_server_args --remote=punix:"$sandbox"/db.sock $ovsdb_server_args