From cc6315fa89f59616b886970be8be1e47251b719b Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 6 Dec 2022 10:45:20 +0000
Subject: [PATCH] Bind relay to local address rather than hostname

The use of local hostname seems to confuse later versions of
ovsdb-server; switch to implicit binding to all local addresses.

Change-Id: Ieb84177d239e02346addf0af3cf1ed1e812dbcb7
---
 src/templates/ovn-relay-wrapper.sh.j2 | 2 +-
 tox.ini                               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/templates/ovn-relay-wrapper.sh.j2 b/src/templates/ovn-relay-wrapper.sh.j2
index 0ddf56e..b1e5307 100644
--- a/src/templates/ovn-relay-wrapper.sh.j2
+++ b/src/templates/ovn-relay-wrapper.sh.j2
@@ -27,6 +27,6 @@ ovsdb-server \
     --log-file=/var/log/ovn/ovn-relay.log \
     --pidfile=/var/run/ovn/ovn-relay.pid \
     --unixctl=/var/run/ovn/ovn_relay.sock \
-    --remote=pssl:6642:{{ ovsdb_cms.local_hostname }} relay:OVN_Southbound:$REMOTES
+    --remote=pssl:6642 relay:OVN_Southbound:$REMOTES
 
 trap stop_svc EXIT
diff --git a/tox.ini b/tox.ini
index ea682f9..0efeb04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -98,8 +98,7 @@ commands = {[testenv:lint]commands}
 description = Check code against coding style standards
 deps =
     black
-    # flake8==4.0.1 # Pin version until https://github.com/csachs/pyproject-flake8/pull/14 is merged
-    flake8
+    flake8<6
     flake8-docstrings
     flake8-copyright
     flake8-builtins