-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BGP] Fix TLS options for local OVN DB creation
The options added to the ovn-ctl commands used to create local OVN NB and SB DBs when TLS was enabled were wrong. With this PR, the correct options are used instead. Jira: OSPRH-11428
- Loading branch information
1 parent
c67d385
commit bd6c869
Showing
2 changed files
with
24 additions
and
2 deletions.
There are no files selected for viewing
13 changes: 12 additions & 1 deletion
13
roles/edpm_ovn_bgp_agent/templates/kolla_config/nb_db_server.yaml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,12 @@ | ||
command: "/usr/share/ovn/scripts/ovn-ctl --no-monitor run_nb_ovsdb {% if edpm_ovn_bgp_agent_internal_tls_enable | bool %} -p /etc/pki/tls/private/ovndb.key -c /etc/pki/tls/certs/ovndb.crt -C /etc/pki/tls/certs/ovndbca.crt {% else %} --db-nb-create-insecure-remote=yes {% endif %}" | ||
command: >- | ||
/usr/share/ovn/scripts/ovn-ctl --no-monitor run_nb_ovsdb | ||
{% if edpm_ovn_bgp_agent_internal_tls_enable | bool %} | ||
--ovn-nb-db-ssl-key=/etc/pki/tls/private/ovndb.key | ||
--ovn-nb-db-ssl-cert=/etc/pki/tls/certs/ovndb.crt | ||
--ovn-nb-db-ssl-ca-cert=/etc/pki/tls/certs/ovndbca.crt | ||
--db-nb-cluster-local-proto=ssl | ||
--db-nb-cluster-remote-proto=ssl | ||
--db-nb-create-insecure-remote=no | ||
{% else %} | ||
--db-nb-create-insecure-remote=yes | ||
{% endif %} |
13 changes: 12 additions & 1 deletion
13
roles/edpm_ovn_bgp_agent/templates/kolla_config/sb_db_server.yaml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,12 @@ | ||
command: "/usr/share/ovn/scripts/ovn-ctl --no-monitor run_sb_ovsdb {% if edpm_ovn_bgp_agent_internal_tls_enable | bool %} -p /etc/pki/tls/private/ovndb.key -c /etc/pki/tls/certs/ovndb.crt -C /etc/pki/tls/certs/ovndbca.crt {% else %} --db-sb-create-insecure-remote=yes {% endif %}" | ||
command: >- | ||
/usr/share/ovn/scripts/ovn-ctl --no-monitor run_sb_ovsdb | ||
{% if edpm_ovn_bgp_agent_internal_tls_enable | bool %} | ||
--ovn-sb-db-ssl-key=/etc/pki/tls/private/ovndb.key | ||
--ovn-sb-db-ssl-cert=/etc/pki/tls/certs/ovndb.crt | ||
--ovn-sb-db-ssl-ca-cert=/etc/pki/tls/certs/ovndbca.crt | ||
--db-sb-cluster-local-proto=ssl | ||
--db-sb-cluster-remote-proto=ssl | ||
--db-sb-create-insecure-remote=no | ||
{% else %} | ||
--db-sb-create-insecure-remote=yes | ||
{% endif %} |