Use new default nb and sb dbs for sandbox northd:

As per new clustering change, ovn-northd sandbox should use nb1.ovsdb and sb1.ovsdb. It was updated in ovn-northd --help section but missed for sandbox. This commit fixes the same Reported-by: Mark Michelson <[email protected]> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2018-March/345535.html Signed-off-by: aginwala <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
qlw · Mar 31, 2018 · e8663e5 · e8663e5
1 parent bbb2cb2
commit e8663e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tutorial/ovn-setup.sh b/tutorial/ovn-setup.sh
@@ -31,5 +31,9 @@ ovs-vsctl add-port br-int p2 -- \
 # View a summary of the configuration
 printf "\n=== ovn-nbctl show ===\n\n"
 ovn-nbctl show
+printf "\n=== ovn-nbctl show with wait hv ===\n\n"
+ovn-nbctl --wait=hv show
 printf "\n=== ovn-sbctl show ===\n\n"
 ovn-sbctl show
+printf "\n=== ovn-sbctl show with wait hv ===\n\n"
+ovn-sbctl --wait=hv show
diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
@@ -510,8 +510,8 @@ if $ovn; then
     fi
     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
+        --ovnsb-db=unix:"$sandbox"/sb1.ovsdb \
+        --ovnnb-db=unix:"$sandbox"/nb1.ovsdb
     rungdb $gdb_ovn_controller $gdb_ovn_controller_ex ovn-controller \
         $OVN_CTRLR_PKI --detach --no-chdir --pidfile -vconsole:off --log-file
     rungdb $gdb_ovn_controller_vtep $gdb_ovn_controller_vtep_ex \