diff options
| author | aginwala <amginwal@gmail.com> | 2018-03-23 13:44:52 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-03-31 12:41:32 -0700 |
| commit | e8663e53e6e27506c63d69aa5124018c24514c86 (patch) | |
| tree | c9ea59669c3974e3feee445ca9848baaf4b05e68 /tutorial | |
| parent | bbb2cb209a76e7640ba93b91a0cbbe955fb16056 (diff) | |
| download | openvswitch-e8663e53e6e27506c63d69aa5124018c24514c86.tar.gz | |
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 <mmichels@redhat.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2018-March/345535.html
Signed-off-by: aginwala <aginwala@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'tutorial')
| -rwxr-xr-x | tutorial/ovn-setup.sh | 4 | ||||
| -rwxr-xr-x | tutorial/ovs-sandbox | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tutorial/ovn-setup.sh b/tutorial/ovn-setup.sh index 943ca58ed..9a725cf09 100755 --- 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 index babc03256..c3e9f1277 100755 --- 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 \ |