openstack/sunbeam-charms
Code Issues Proposed changes

Remove os-*-hostname variables

Browse Source 
All traffic is either from traefik (which will handle hostname itself),
or through the K8S SVC. os-*-hostname variables should not be used.

Change-Id: I29b5798ed2fa7cc952ac686d7591921c678a6859
This commit is contained in:
Guillaume Boutry 2024-05-10 11:40:34 +02:00
parent 44c4bf300f
commit bb61feacfd
No known key found for this signature in database
GPG Key ID: E95E3326872E55DE
23 changed files with 11 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
charms/aodh-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/ceilometer-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/cinder-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: cinder.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the cinder volume provider.
type: string
os-internal-hostname:
default: cinder.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the cinder volume provider.
type: string
os-public-hostname:
default: cinder.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the cinder volume provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

4
charms/cinder-k8s/tests/unit/test_cinder_charm.py
View File

@ -42,6 +42,10 @@ class _CinderOperatorCharm(charm.CinderOperatorCharm):
super().configure_charm(event)
self._log_event(event)
@property
def public_ingress_address(self):
return "cinder.juju"
class TestCinderOperatorCharm(test_utils.CharmTestCase):
"""Unit tests for Cinder Operator."""

18
charms/designate-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: designate.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the designate image provider.
type: string
os-internal-hostname:
default: designate.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the designate image provider.
type: string
os-public-hostname:
default: designate.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the designate image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/glance-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default:
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/gnocchi-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/heat-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: heat.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: heat.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: heat.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/horizon-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
session-timeout:
type: int
default: 3600

18
charms/keystone-k8s/config.yaml
View File

@ -24,24 +24,6 @@ options:
description: Name of tenant to associate with service credentials
type: string
os-admin-hostname:
default:
description: |
The hostname or address of the admin endpoints that should be advertised
in the keystone identity provider.
type: string
os-internal-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the keystone identity provider.
type: string
os-public-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the keystone identity provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

16
charms/keystone-k8s/src/charm.py
View File

@ -1392,11 +1392,9 @@ export OS_AUTH_VERSION=3
@property
def admin_endpoint(self):
"""Admin endpoint for keystone api."""
admin_hostname = self.model.config.get("os-admin-hostname")
if not admin_hostname:
admin_hostname = self.model.get_binding(
self.IDSVC_RELATION_NAME
).network.ingress_address
admin_hostname = self.model.get_binding(
self.IDSVC_RELATION_NAME
).network.ingress_address
return f"http://{admin_hostname}:{self.service_port}/v3"
@property
@ -1405,11 +1403,9 @@ export OS_AUTH_VERSION=3
if self.ingress_internal and self.ingress_internal.url:
return self.ingress_internal.url + "/v3"
internal_hostname = self.model.config.get("os-internal-hostname")
if not internal_hostname:
internal_hostname = self.model.get_binding(
self.IDSVC_RELATION_NAME
).network.ingress_address
internal_hostname = self.model.get_binding(
self.IDSVC_RELATION_NAME
).network.ingress_address
return f"http://{internal_hostname}:{self.service_port}/v3"
@property

18
charms/magnum-k8s/config.yaml
View File

@ -13,24 +13,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: magnum.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: magnum.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: magnum.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/neutron-k8s/config.yaml
View File

@ -12,24 +12,6 @@ options:
will not enable internal cloud dns resolution. This value should end
with a '.', e.g. 'cloud.example.org.'.
type: string
os-admin-hostname:
default:
description: |
The hostname or address of the admin endpoints that should be advertised
in the neutron image provider.
type: string
os-internal-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the neutron image provider.
type: string
os-public-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the neutron image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/nova-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default:
description: |
The hostname or address of the admin endpoints that should be advertised
in the nova image provider.
type: string
os-internal-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the nova image provider.
type: string
os-public-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the nova image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/octavia-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: octavia.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the loadbalancer provider.
type: string
os-internal-hostname:
default: octavia.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the loadbalancer provider.
type: string
os-public-hostname:
default: octavia.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the loadbalancer provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
charms/openstack-images-sync-k8s/charmcraft.yaml
View File

@ -48,24 +48,6 @@ config:
description: |
The maximum number of images to keep in sync per version.
type: int
os-admin-hostname:
default: openstack-images-sync.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the openstack image sync.
type: string
os-internal-hostname:
default: openstack-images-sync.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the openstack image sync.
type: string
os-public-hostname:
default: openstack-images-sync.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the openstack image sync.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

11
charms/ovn-relay-k8s/config.yaml
View File

@ -1,11 +0,0 @@
# Copyright 2022 Canonical Ltd.
# See LICENSE file for licensing details.
#
options:
os-public-hostname:
default: ovn-relay.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the neutron image provider.
type: string

18
charms/placement-k8s/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default:
description: |
The hostname or address of the admin endpoints that should be advertised
in the placement image provider.
type: string
os-internal-hostname:
default:
description: |
The hostname or address of the internal endpoints that should be advertised
in the placement image provider.
type: string
os-public-hostname:
default:
description: |
The hostname or address of the public endpoints that should be advertised
in the placement image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

2
ops-sunbeam/doc/bundles/full.yaml
View File

@ -54,8 +54,6 @@ applications:
channel: edge
scale: 1
trust: true
options:
os-public-hostname:
ovn-central:
charm: ch:ovn-central-k8s
channel: edge

2
ops-sunbeam/doc/bundles/minimal.yaml
View File

@ -55,8 +55,6 @@ applications:
channel: edge
scale: 1
trust: true
options:
os-public-hostname:
ovn-central:
charm: ch:ovn-central-k8s
channel: edge

11
ops-sunbeam/ops_sunbeam/charm.py
View File

@ -229,12 +229,7 @@ class OSBaseOperatorCharm(ops.charm.CharmBase):
def get_domain_name_sans(self) -> List[str]:
"""Get Domain names for service."""
domain_name_sans = []
for binding_config in ["admin", "internal", "public"]:
hostname = self.config.get(f"os-{binding_config}-hostname")
if hostname:
domain_name_sans.append(hostname)
return domain_name_sans
return []
def check_leader_ready(self):
"""Check the leader is reporting as ready."""
@ -798,10 +793,6 @@ class OSBaseOperatorAPICharm(OSBaseOperatorCharmK8S):
@property
def public_ingress_address(self) -> str:
"""IP address or hostname for access to this service."""
svc_hostname = self.model.config.get("os-public-hostname")
if svc_hostname:
return svc_hostname
client = Client()
charm_service = client.get(
Service, name=self.app.name, namespace=self.model.name

18
ops-sunbeam/shared_code/config-api.yaml
View File

@ -2,24 +2,6 @@
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions

18
ops-sunbeam/shared_code/sunbeam_charm/{{cookiecutter.service_name}}/config.yaml
View File

@ -3,24 +3,6 @@ options:
default: False
description: Enable debug logging.
type: boolean
os-admin-hostname:
default: glance.juju
description: |
The hostname or address of the admin endpoints that should be advertised
in the glance image provider.
type: string
os-internal-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
os-public-hostname:
default: glance.juju
description: |
The hostname or address of the internal endpoints that should be advertised
in the glance image provider.
type: string
region:
default: RegionOne
description: Space delimited list of OpenStack regions