From: aginwala <[email protected]> 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 Acked-By: aginwala <[email protected]> Signed-off-by: aginwala <[email protected]> --- ...-default-nb-and-sb-dbs-for-sandbox-northd.patch | 50 ++++++++++++++++++++++ tutorial/ovn-setup.sh | 4 ++ tutorial/ovs-sandbox | 4 +- 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 0001-Use-new-default-nb-and-sb-dbs-for-sandbox-northd.patch diff --git a/0001-Use-new-default-nb-and-sb-dbs-for-sandbox-northd.patch b/0001-Use-new-default-nb-and-sb-dbs-for-sandbox-northd.patch new file mode 100644 index 0000000..c8a0286 --- /dev/null +++ b/0001-Use-new-default-nb-and-sb-dbs-for-sandbox-northd.patch @@ -0,0 +1,50 @@ +From eb9051426693843797ea0f2a0bf21b1b5272fd2f Mon Sep 17 00:00:00 2001 +From: aginwala <[email protected]> +Date: Fri, 23 Mar 2018 12:41:24 -0700 +Subject: [PATCH] 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 +Acked-By: aginwala <[email protected]> +Signed-off-by: aginwala <[email protected]> +--- + tutorial/ovn-setup.sh | 4 ++++ + tutorial/ovs-sandbox | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tutorial/ovn-setup.sh b/tutorial/ovn-setup.sh +index 943ca58..9a725cf 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 babc032..c3e9f12 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 \ +-- +1.9.1 + diff --git a/tutorial/ovn-setup.sh b/tutorial/ovn-setup.sh index 943ca58..9a725cf 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 babc032..c3e9f12 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 \ -- 1.9.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
