From 60bdd01148e472d4ae25cf6daae8d121779d1e03 Mon Sep 17 00:00:00 2001 From: "RYAN D. MOATS" Date: Mon, 21 Mar 2016 15:40:01 -0500 Subject: Separating OVN NB and SB database processes OVN NB & SB DB's should be run in separate ovsdb-server processes and should run with ovn-ctl start_northd / stop_northd. This patch includes changes to unit tests, tutorial and debian scripts to remain self-consistent. Signed-off-by: RYAN D. MOATS Signed-off-by: Michael Arnaldi Co-authored-by: Michael Arnaldi Signed-off-by: Russell Bryant --- tutorial/ovs-sandbox | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'tutorial') diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index 99cc3bb8d..f331a0015 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -318,10 +318,22 @@ if $ovn; then run ovsdb-tool create ovnsb.db "$ovnsb_schema" run ovsdb-tool create ovnnb.db "$ovnnb_schema" run ovsdb-tool create vtep.db "$vtep_schema" - ovsdb_server_args="ovnsb.db ovnnb.db vtep.db conf.db" + ovsdb_server_args="vtep.db conf.db" + ovsdb_sb_server_args="ovnsb.db" + ovsdb_nb_server_args="ovnnb.db" fi rungdb $gdb_ovsdb $gdb_ovsdb_ex ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ --remote=punix:"$sandbox"/db.sock $ovsdb_server_args +if $ovn; then + rungdb $gdb_ovsdb $gdb_ovsdb_ex ovsdb-server --detach --no-chdir \ + --pidfile="$sandbox"/ovnnb_db.pid -vconsole:off \ + --log-file="$sandbox"/ovnnb_db.log \ + --remote=punix:"$sandbox"/ovnnb_db.sock $ovsdb_nb_server_args + rungdb $gdb_ovsdb $gdb_ovsdb_ex ovsdb-server --detach --no-chdir \ + --pidfile="$sandbox"/ovnsb_db.pid -vconsole:off \ + --log-file="$sandbox"/ovnsb_db.log \ + --remote=punix:"$sandbox"/ovnsb_db.sock $ovsdb_sb_server_args +fi #Add a small delay to allow ovsdb-server to launch. sleep 0.1 @@ -344,13 +356,19 @@ rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile if $ovn; then ovs-vsctl set open . external-ids:system-id=56b18105-5706-46ef-80c4-ff20979ab068 - ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/db.sock + ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/ovnsb_db.sock ovs-vsctl set open . external-ids:ovn-encap-type=geneve ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1 - rungdb $gdb_ovn_northd $gdb_ovn_northd_ex ovn-northd --detach --no-chdir --pidfile -vconsole:off --log-file - rungdb $gdb_ovn_controller $gdb_ovn_controller_ex ovn-controller --detach --no-chdir --pidfile -vconsole:off --log-file - rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex ovn-controller-vtep --detach --no-chdir --pidfile -vconsole:off --log-file + rungdb $gdb_ovn_northd $gdb_ovn_northd_ex ovn-northd --detach \ + --no-chdir --pidfile -vconsole:off --log-file \ + --ovnsb-db=unix:"$sandbox"/ovnsb_db.sock \ + --ovnnb-db=unix:"$sandbox"/ovnnb_db.sock + rungdb $gdb_ovn_controller $gdb_ovn_controller_ex ovn-controller \ + --detach --no-chdir --pidfile -vconsole:off --log-file + rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex \ + ovn-controller-vtep --detach --no-chdir --pidfile -vconsole:off \ + --log-file --ovnsb-db=unix:"$sandbox"/ovnsb_db.sock fi cat <