From 03d1778356ec59ee9badc9d1ad4d137ef0ba8ff8 Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 20 Oct 2022 14:55:02 +0100 Subject: [PATCH] Switch to using hostnames for addressing K8S pods can change IP during charm upgrades; switch to using the fully qualified hostname for participating units for connectivity between units. Hostnames won't change and are dynamically managed by K8S. Depends-On: Ief5c816ab5fbeb55aadf2b83697858f2ecb28807 Change-Id: I2410c19226484d802d95c198d4c1df8763181e09 --- .../lib/charms/ovn_central_k8s/v0/ovsdb.py | 8 ++++---- .../src/templates/ovn-nb-db-server-wrapper.sh.j2 | 4 ++-- .../src/templates/ovn-sb-db-server-wrapper.sh.j2 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charms/ovn-central-k8s/lib/charms/ovn_central_k8s/v0/ovsdb.py b/charms/ovn-central-k8s/lib/charms/ovn_central_k8s/v0/ovsdb.py index f161c239..08c5db9e 100644 --- a/charms/ovn-central-k8s/lib/charms/ovn_central_k8s/v0/ovsdb.py +++ b/charms/ovn-central-k8s/lib/charms/ovn_central_k8s/v0/ovsdb.py @@ -37,7 +37,7 @@ LIBAPI = 0 # Increment this PATCH version before using `charmcraft publish-lib` or reset # to 0 if you are raising the major API version -LIBPATCH = 1 +LIBPATCH = 2 # TODO: add your code here! Happy coding! @@ -101,11 +101,11 @@ class OVSDBCMSRequires(Object): logging.debug("OVSDBCMSRequires on_joined") self.on.connected.emit() - def bound_addresses(self): - return self.get_all_unit_values("bound-address") + def bound_hostnames(self): + return self.get_all_unit_values("bound-hostname") def remote_ready(self): - return all(self.bound_addresses()) + return all(self.bound_hostnames()) def _on_ovsdb_cms_relation_changed(self, event): """OVSDBCMS relation changed.""" diff --git a/charms/ovn-central-k8s/src/templates/ovn-nb-db-server-wrapper.sh.j2 b/charms/ovn-central-k8s/src/templates/ovn-nb-db-server-wrapper.sh.j2 index d8f1750a..85af1606 100644 --- a/charms/ovn-central-k8s/src/templates/ovn-nb-db-server-wrapper.sh.j2 +++ b/charms/ovn-central-k8s/src/templates/ovn-nb-db-server-wrapper.sh.j2 @@ -19,10 +19,10 @@ trap stop_svc EXIT log_msg "Starting" /usr/share/ovn/scripts/ovn-ctl run_nb_ovsdb \ - --db-nb-cluster-local-addr={{ peers.cluster_local_addr }} \ + --db-nb-cluster-local-addr={{ peers.cluster_local_hostname }} \ --db-nb-cluster-local-port={{ peers.db_nb_cluster_port }} \ --db-nb-cluster-local-proto=ssl \ - --db-nb-cluster-remote-addr={{ peers.cluster_remote_addrs | first if not ovs_db.is_charm_leader else '' }} \ + --db-nb-cluster-remote-addr={{ peers.cluster_remote_hostnames | first if not ovs_db.is_charm_leader else '' }} \ --db-nb-cluster-remote-port={{ peers.db_nb_cluster_port }} \ --db-nb-cluster-remote-proto=ssl \ --ovn-nb-db-ssl-key={{ ovs_db.ovn_key }} \ diff --git a/charms/ovn-central-k8s/src/templates/ovn-sb-db-server-wrapper.sh.j2 b/charms/ovn-central-k8s/src/templates/ovn-sb-db-server-wrapper.sh.j2 index 5e6650d2..39986349 100644 --- a/charms/ovn-central-k8s/src/templates/ovn-sb-db-server-wrapper.sh.j2 +++ b/charms/ovn-central-k8s/src/templates/ovn-sb-db-server-wrapper.sh.j2 @@ -19,10 +19,10 @@ trap stop_svc EXIT log_msg "Starting" /usr/share/ovn/scripts/ovn-ctl run_sb_ovsdb \ - --db-sb-cluster-local-addr={{ peers.cluster_local_addr }} \ + --db-sb-cluster-local-addr={{ peers.cluster_local_hostname }} \ --db-sb-cluster-local-port={{ peers.db_sb_cluster_port }} \ --db-sb-cluster-local-proto=ssl \ - --db-sb-cluster-remote-addr={{ peers.cluster_remote_addrs | first if not ovs_db.is_charm_leader else '' }} \ + --db-sb-cluster-remote-addr={{ peers.cluster_remote_hostnames | first if not ovs_db.is_charm_leader else '' }} \ --db-sb-cluster-remote-port={{ peers.db_sb_cluster_port }} \ --db-sb-cluster-remote-proto=ssl \ --ovn-sb-db-ssl-key={{ ovs_db.ovn_key }} \