From ada906f42e9f8439fe5ae6ddcc30e461b62404a1 Mon Sep 17 00:00:00 2001 From: Pedro Guimaraes Date: Mon, 7 Oct 2024 09:14:51 +0200 Subject: [PATCH] Fix charm_version and moves to self.hostname --- charm_version | 2 +- src/core/models.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charm_version b/charm_version index 7e5be413..d3827e75 100644 --- a/charm_version +++ b/charm_version @@ -1 +1 @@ -1.0+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty+49ef051-dirty +1.0 diff --git a/src/core/models.py b/src/core/models.py index 9fa77937..7872dfa6 100644 --- a/src/core/models.py +++ b/src/core/models.py @@ -173,12 +173,12 @@ def password_rotated(self) -> bool: return bool(self.relation_data.get("password-rotated", None)) @property - def hostname(self) -> str | None: + def hostname(self) -> str: """The hostname for the unit.""" return socket.gethostname() @property - def fqdn(self) -> str | None: + def fqdn(self) -> str: """The Fully Qualified Domain Name for the unit.""" return socket.getfqdn(self.private_ip) @@ -196,7 +196,7 @@ def private_ip(self) -> str: else None ) # Optional fallback, if no binding is found - return address or socket.gethostbyname(socket.gethostname()) + return address or socket.gethostbyname(self.hostname) @property def public_ip(self) -> str: @@ -212,7 +212,7 @@ def public_ip(self) -> str: else None ) # Optional fallback, if no binding is found - return address or socket.gethostbyname(socket.gethostname()) + return address or socket.gethostbyname(self.hostname) @property def host(self) -> str: