From 46c2b60d9f58c8398929cbf2a4a935150817d601 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Thu, 4 May 2023 09:41:20 +0100 Subject: [PATCH] Correct ovn-ctl --db-nb-pidfile usage in templates The flags ``--db-nb-pid`` and ``--db-sb-pid`` are corected to be ``--db-nb-pidfile`` and ``--db-sb-pidfile`` respectively. See here for reference: https://github.com/ovn-org/ovn/blob/6c6a7ad1c64a21923dc9b5bea7069fd88bcdd6a8/utilities/ovn-ctl#L1045 Closes-Bug: #2018436 Change-Id: Ic1e8768374566eb2198302807ecc644a19cd3062 --- ansible/roles/ovn-db/templates/ovn-nb-db.json.j2 | 2 +- ansible/roles/ovn-db/templates/ovn-sb-db.json.j2 | 2 +- ...ect-ovn-ctl-pid-flag-in-template-d915fe4b71548da0.yaml | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/correct-ovn-ctl-pid-flag-in-template-d915fe4b71548da0.yaml diff --git a/ansible/roles/ovn-db/templates/ovn-nb-db.json.j2 b/ansible/roles/ovn-db/templates/ovn-nb-db.json.j2 index a977a4882c..e1a542a685 100644 --- a/ansible/roles/ovn-db/templates/ovn-nb-db.json.j2 +++ b/ansible/roles/ovn-db/templates/ovn-nb-db.json.j2 @@ -1,5 +1,5 @@ { - "command": "/usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb --db-nb-addr={{ api_interface_address | put_address_in_context('url') }} --db-nb-cluster-local-addr={{ api_interface_address | put_address_in_context('url') }} {% if groups['ovn-nb-db'] | length > 1 and inventory_hostname != groups['ovn-nb-db'][0] %} --db-nb-cluster-remote-addr={{ 'api' | kolla_address(groups['ovn-nb-db'][0]) | put_address_in_context('url') }} {% endif %} --db-nb-sock=/run/ovn/ovnnb_db.sock --db-nb-pid=/run/ovn/ovnnb_db.pid --db-nb-file=/var/lib/openvswitch/ovn-nb/ovnnb.db --ovn-nb-logfile=/var/log/kolla/openvswitch/ovn-nb-db.log", + "command": "/usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb --db-nb-addr={{ api_interface_address | put_address_in_context('url') }} --db-nb-cluster-local-addr={{ api_interface_address | put_address_in_context('url') }} {% if groups['ovn-nb-db'] | length > 1 and inventory_hostname != groups['ovn-nb-db'][0] %} --db-nb-cluster-remote-addr={{ 'api' | kolla_address(groups['ovn-nb-db'][0]) | put_address_in_context('url') }} {% endif %} --db-nb-sock=/run/ovn/ovnnb_db.sock --db-nb-pidfile=/run/ovn/ovnnb_db.pid --db-nb-file=/var/lib/openvswitch/ovn-nb/ovnnb.db --ovn-nb-logfile=/var/log/kolla/openvswitch/ovn-nb-db.log", "permissions": [ { "path": "/var/log/kolla/openvswitch", diff --git a/ansible/roles/ovn-db/templates/ovn-sb-db.json.j2 b/ansible/roles/ovn-db/templates/ovn-sb-db.json.j2 index 4d693e6325..6a0305171e 100644 --- a/ansible/roles/ovn-db/templates/ovn-sb-db.json.j2 +++ b/ansible/roles/ovn-db/templates/ovn-sb-db.json.j2 @@ -1,5 +1,5 @@ { - "command": "/usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb --db-sb-addr={{ api_interface_address | put_address_in_context('url') }} --db-sb-cluster-local-addr={{ api_interface_address | put_address_in_context('url') }} {% if groups['ovn-sb-db'] | length > 1 and inventory_hostname != groups['ovn-sb-db'][0] %} --db-sb-cluster-remote-addr={{ 'api' | kolla_address(groups['ovn-sb-db'][0]) | put_address_in_context('url') }} {% endif %} --db-sb-sock=/run/ovn/ovnsb_db.sock --db-sb-pid=/run/ovn/ovnsb_db.pid --db-sb-file=/var/lib/openvswitch/ovn-sb/ovnsb.db --ovn-sb-logfile=/var/log/kolla/openvswitch/ovn-sb-db.log", + "command": "/usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb --db-sb-addr={{ api_interface_address | put_address_in_context('url') }} --db-sb-cluster-local-addr={{ api_interface_address | put_address_in_context('url') }} {% if groups['ovn-sb-db'] | length > 1 and inventory_hostname != groups['ovn-sb-db'][0] %} --db-sb-cluster-remote-addr={{ 'api' | kolla_address(groups['ovn-sb-db'][0]) | put_address_in_context('url') }} {% endif %} --db-sb-sock=/run/ovn/ovnsb_db.sock --db-sb-pidfile=/run/ovn/ovnsb_db.pid --db-sb-file=/var/lib/openvswitch/ovn-sb/ovnsb.db --ovn-sb-logfile=/var/log/kolla/openvswitch/ovn-sb-db.log", "permissions": [ { "path": "/var/log/kolla/openvswitch", diff --git a/releasenotes/notes/correct-ovn-ctl-pid-flag-in-template-d915fe4b71548da0.yaml b/releasenotes/notes/correct-ovn-ctl-pid-flag-in-template-d915fe4b71548da0.yaml new file mode 100644 index 0000000000..6ecd421be6 --- /dev/null +++ b/releasenotes/notes/correct-ovn-ctl-pid-flag-in-template-d915fe4b71548da0.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + The flags ``--db-nb-pid`` and ``--db-sb-pid`` have been corected to be + ``--db-nb-pidfile`` and ``--db-sb-pidfile`` respectively. See here for + reference: + https://github.com/ovn-org/ovn/blob/6c6a7ad1c64a21923dc9b5bea7069fd88bcdd6a8/utilities/ovn-ctl#L1045 + `LP#2018436 `__