@@ -7,8 +7,6 @@ DEBUG_OPT="--ovn-northd-wrapper=$DEBUG_WRAPPER --ovsdb-nb-wrapper=$DEBUG_WRAPPER
7
7
echo " PROBE_INTERVAL is set to $PROBE_INTERVAL "
8
8
echo " OVN_LEADER_PROBE_INTERVAL is set to $OVN_LEADER_PROBE_INTERVAL "
9
9
10
- OVN_NORTHD_N_THREADS=" 4"
11
- echo " OVN_NORTHD_N_THREADS is set to $OVN_NORTHD_N_THREADS "
12
10
# https://bugs.launchpad.net/neutron/+bug/1776778
13
11
if grep -q " 3.10.0-862" /proc/version
14
12
then
@@ -277,7 +275,7 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
277
275
--remote=db:Local_Config,Config,connections \
278
276
/etc/ovn/ovnsb_local_config.db
279
277
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
280
- --ovn-manage-ovsdb=no --ovn-northd-n-threads= " ${OVN_NORTHD_N_THREADS} " start_northd
278
+ --ovn-manage-ovsdb=no start_northd
281
279
ovn-nbctl --no-leader-only set NB_Global . options:inactivity_probe=${PROBE_INTERVAL}
282
280
ovn-sbctl --no-leader-only set SB_Global . options:inactivity_probe=${PROBE_INTERVAL}
283
281
ovn-nbctl --no-leader-only set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
@@ -343,7 +341,6 @@ if [[ "$ENABLE_SSL" == "false" ]]; then
343
341
/usr/share/ovn/scripts/ovn-ctl \
344
342
$ovn_ctl_args \
345
343
--ovn-manage-ovsdb=no \
346
- --ovn-northd-n-threads=" ${OVN_NORTHD_N_THREADS} " \
347
344
start_northd
348
345
fi
349
346
fi
359
356
--ovn-northd-ssl-key=/var/run/tls/key \
360
357
--ovn-northd-ssl-cert=/var/run/tls/cert \
361
358
--ovn-northd-ssl-ca-cert=/var/run/tls/cacert \
362
- --ovn-northd-n-threads=" ${OVN_NORTHD_N_THREADS} " \
363
359
restart_northd
364
360
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set-connection pssl:" ${NB_PORT} " :[" ${DB_ADDR} " ]
365
361
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set Connection . inactivity_probe=${PROBE_INTERVAL}
417
413
--remote=db:Local_Config,Config,connections \
418
414
/etc/ovn/ovnsb_local_config.db
419
415
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
420
- --ovn-manage-ovsdb=no --ovn-northd-n-threads= " ${OVN_NORTHD_N_THREADS} " start_northd
416
+ --ovn-manage-ovsdb=no start_northd
421
417
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:northd_probe_interval=${PROBE_INTERVAL}
422
418
ovn-nbctl --no-leader-only -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert set NB_Global . options:use_logical_dp_groups=true
423
419
else
485
481
--remote=db:Local_Config,Config,connections \
486
482
/etc/ovn/ovnsb_local_config.db
487
483
/usr/share/ovn/scripts/ovn-ctl $ovn_ctl_args \
488
- --ovn-manage-ovsdb=no --ovn-northd-n-threads= " ${OVN_NORTHD_N_THREADS} " start_northd
484
+ --ovn-manage-ovsdb=no start_northd
489
485
fi
490
486
fi
491
487
fi
0 commit comments