diff options
| author | RYAN D. MOATS <rmoats@us.ibm.com> | 2016-03-21 15:40:01 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-03-23 20:07:43 -0400 |
| commit | 60bdd01148e472d4ae25cf6daae8d121779d1e03 (patch) | |
| tree | 6d216f5b9cccb94f93f3a4b1672dee0e141be95f /tutorial | |
| parent | 9a4457eabcc3f78fec4c9e48dc5b60b23479ee59 (diff) | |
| download | openvswitch-60bdd01148e472d4ae25cf6daae8d121779d1e03.tar.gz | |
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 <rmoats@us.ibm.com>
Signed-off-by: Michael Arnaldi <arnaldimichael@gmail.com>
Co-authored-by: Michael Arnaldi <arnaldimichael@gmail.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
Diffstat (limited to 'tutorial')
| -rwxr-xr-x | tutorial/ovs-sandbox | 28 |
1 files changed, 23 insertions, 5 deletions
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 <<EOF |