Merge "Configure OVN NB and SB DB Connection probes"

defaults/main.yml

@@ -481,6 +481,8 @@ neutron_ovn_l3_scheduler: leastloaded
 neutron_ovn_nb_connection: "{{ ovn_proto }}:{{ groups['neutron_ovn_northd'] | map('extract', hostvars, ['ansible_host']) | join(':6641,'+ ovn_proto + ':') }}:6641"
 neutron_ovn_sb_connection: "{{ ovn_proto }}:{{ groups['neutron_ovn_northd'] | map('extract', hostvars, ['ansible_host']) | join(':6642,' + ovn_proto + ':') }}:6642"
 neutron_ovsdb_manager: ptcp:6640:127.0.0.1
+neutron_ovn_sb_inactivity_probe: 60000
+neutron_ovn_nb_inactivity_probe: 60000
 
 # Storage location for SSL certificate authority
 neutron_ovn_pki_dir: "{{ openstack_pki_dir }}"

tasks/providers/ovn_cluster_setup.yml

@@ -81,13 +81,12 @@
     - not leader_node
     - ovn_northd_opts.changed
 
-- name: set ssl for ovn-nb and ovn-sb
+- name: Configure connection settings for ovn-nb and ovn-sb
   command: "{{ cmd }}"
   with_items:
-    - "ovn-nbctl set-connection pssl:6641"
-    - "ovn-sbctl set-connection pssl:6642"
+    - "ovn-nbctl --inactivity-probe={{ neutron_ovn_nb_inactivity_probe }} set-connection p{{ ovn_proto }}:6641"
+    - "ovn-sbctl --inactivity-probe={{ neutron_ovn_sb_inactivity_probe }} set-connection p{{ ovn_proto }}:6642"
   when:
-    - neutron_ovn_ssl
     - "inventory_hostname == neutron_ovn_primary_cluster_node"
     - _check_cluster_db.rc != 0
     - not leader_node

templates/ovn-northd-opts.j2

@@ -2,8 +2,6 @@
 
 # OVN cluster parameters
 {{ neutron_ovn_northd_opts }}=" \
-  --db-nb-create-insecure-remote={{ (neutron_ovn_ssl) | ternary('no','yes') }} \
-  --db-sb-create-insecure-remote={{ (neutron_ovn_ssl) | ternary('no','yes') }} \
   --db-nb-addr={{ ansible_host }} \
   --db-sb-addr={{ ansible_host }} \
   --db-nb-cluster-local-addr={{ ansible_host }} \