openstack/sunbeam-charms
Code Issues Proposed changes

Merge "[hypervisor] Add hostname as subject alternative names" into main

Browse Source
This commit is contained in:
Zuul 2024-10-08 15:20:57 +00:00 committed by Gerrit Code Review
commit 26c7ef9193
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
charms/openstack-hypervisor/src/charm.py
View File

@ -240,6 +240,15 @@ class HypervisorOperatorCharm(sunbeam_charm.OSBaseOperatorCharm):
self.enable_monitoring = False self.enable_monitoring = False
self.configure_charm(event) self.configure_charm(event)
def get_domain_name_sans(self) -> list[str]:
"""Get Domain names for service."""
sans = super().get_domain_name_sans()
sans.append(socket.getfqdn())
sans.append(socket.gethostname())
if self.migration_address:
sans.append(socket.getfqdn(self.migration_address))
return sans
def get_relation_handlers( def get_relation_handlers(
self, handlers: List[sunbeam_rhandlers.RelationHandler] = None self, handlers: List[sunbeam_rhandlers.RelationHandler] = None
) -> List[sunbeam_rhandlers.RelationHandler]: ) -> List[sunbeam_rhandlers.RelationHandler]:

2
charms/openstack-hypervisor/tests/unit/test_charm.py
View File

@ -90,6 +90,7 @@ class TestCharm(test_utils.CharmTestCase):
"openstack-hypervisor": hypervisor_snap_mock "openstack-hypervisor": hypervisor_snap_mock
} }
self.socket.getfqdn.return_value = "test.local" self.socket.getfqdn.return_value = "test.local"
self.socket.gethostname.return_value = "test"
self.initial_setup() self.initial_setup()
self.harness.set_leader() self.harness.set_leader()
@ -202,6 +203,7 @@ class TestCharm(test_utils.CharmTestCase):
"openstack-hypervisor": hypervisor_snap_mock "openstack-hypervisor": hypervisor_snap_mock
} }
self.socket.getfqdn.return_value = "test.local" self.socket.getfqdn.return_value = "test.local"
self.socket.gethostname.return_value = "test"
self.initial_setup() self.initial_setup()
self.harness.set_leader() self.harness.set_leader()
test_utils.add_complete_amqp_relation(self.harness) test_utils.add_complete_amqp_relation(self.harness)