From bf43f5cf8da3ebeee546b1d86e05a5cb235023df Mon Sep 17 00:00:00 2001 From: Guillaume Boutry Date: Thu, 6 Jun 2024 11:14:01 +0200 Subject: [PATCH] [keystone-k8s] remove configurability of admin-.../server-tenant options These options creates more issues than they are solving. Removing `admin-user`, `admin-role`, and `service-tenant` to ensure a standard sunbeam deployment. Rename the `Admin` to the default [1]` admin` role. 1: https://docs.openstack.org/keystone/2024.1/admin/service-api-protection.html Change-Id: I93f3b754e4aca2cc71b0e408555c6d937a9d4e04 --- charms/aodh-k8s/tests/bundles/smoke.yaml | 2 -- charms/barbican-k8s/tests/bundles/smoke.yaml | 2 -- charms/ceilometer-k8s/tests/bundles/smoke.yaml | 2 -- charms/cinder-ceph-k8s/tests/bundles/smoke.yaml | 2 -- charms/cinder-k8s/tests/bundles/smoke.yaml | 2 -- charms/designate-k8s/tests/bundles/smoke.yaml | 3 +-- charms/glance-k8s/tests/bundles/smoke.yaml | 2 -- charms/gnocchi-k8s/tests/bundles/smoke.yaml | 2 -- charms/heat-k8s/tests/bundles/smoke.yaml | 2 -- charms/keystone-k8s/config.yaml | 13 ------------- charms/keystone-k8s/src/charm.py | 8 ++++---- charms/keystone-k8s/tests/bundles/smoke.yaml | 2 -- .../keystone-k8s/tests/unit/test_keystone_charm.py | 2 +- charms/keystone-ldap-k8s/tests/bundles/smoke.yaml | 2 -- charms/magnum-k8s/tests/bundles/smoke.yaml | 3 +-- charms/neutron-k8s/tests/bundles/smoke.yaml | 2 -- charms/nova-k8s/tests/bundles/smoke.yaml | 2 -- charms/octavia-k8s/tests/bundles/smoke.yaml | 2 -- .../openstack-exporter-k8s/tests/bundles/smoke.yaml | 3 +-- charms/ovn-central-k8s/tests/bundles/smoke.yaml | 2 -- charms/ovn-relay-k8s/tests/bundles/smoke.yaml | 2 -- charms/placement-k8s/tests/bundles/smoke.yaml | 2 -- ops-sunbeam/doc/bundles/full.yaml | 2 -- ops-sunbeam/doc/bundles/minimal.yaml | 2 -- tests/caas/smoke.yaml.j2 | 2 -- tests/ceph/smoke.yaml.j2 | 2 -- tests/core/smoke.yaml.j2 | 2 -- tests/misc/smoke.yaml.j2 | 2 -- tests/tempest/smoke.yaml.j2 | 2 -- 29 files changed, 8 insertions(+), 70 deletions(-) diff --git a/charms/aodh-k8s/tests/bundles/smoke.yaml b/charms/aodh-k8s/tests/bundles/smoke.yaml index 3b80f291..a3d3f229 100644 --- a/charms/aodh-k8s/tests/bundles/smoke.yaml +++ b/charms/aodh-k8s/tests/bundles/smoke.yaml @@ -37,8 +37,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/barbican-k8s/tests/bundles/smoke.yaml b/charms/barbican-k8s/tests/bundles/smoke.yaml index b89c04dc..9a18b3c1 100644 --- a/charms/barbican-k8s/tests/bundles/smoke.yaml +++ b/charms/barbican-k8s/tests/bundles/smoke.yaml @@ -30,8 +30,6 @@ applications: channel: 2024.1/edge scale: 1 trust: false - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/ceilometer-k8s/tests/bundles/smoke.yaml b/charms/ceilometer-k8s/tests/bundles/smoke.yaml index f4e48536..2818c939 100644 --- a/charms/ceilometer-k8s/tests/bundles/smoke.yaml +++ b/charms/ceilometer-k8s/tests/bundles/smoke.yaml @@ -37,8 +37,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/cinder-ceph-k8s/tests/bundles/smoke.yaml b/charms/cinder-ceph-k8s/tests/bundles/smoke.yaml index b89053ea..1884a367 100644 --- a/charms/cinder-ceph-k8s/tests/bundles/smoke.yaml +++ b/charms/cinder-ceph-k8s/tests/bundles/smoke.yaml @@ -37,8 +37,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/cinder-k8s/tests/bundles/smoke.yaml b/charms/cinder-k8s/tests/bundles/smoke.yaml index 7bff4a6a..a5623533 100644 --- a/charms/cinder-k8s/tests/bundles/smoke.yaml +++ b/charms/cinder-k8s/tests/bundles/smoke.yaml @@ -36,8 +36,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/designate-k8s/tests/bundles/smoke.yaml b/charms/designate-k8s/tests/bundles/smoke.yaml index 2caef5f6..443a9d72 100644 --- a/charms/designate-k8s/tests/bundles/smoke.yaml +++ b/charms/designate-k8s/tests/bundles/smoke.yaml @@ -29,8 +29,7 @@ applications: channel: 2024.1/edge scale: 1 trust: false - options: - admin-role: admin + storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/glance-k8s/tests/bundles/smoke.yaml b/charms/glance-k8s/tests/bundles/smoke.yaml index 11149cb2..40aeb344 100644 --- a/charms/glance-k8s/tests/bundles/smoke.yaml +++ b/charms/glance-k8s/tests/bundles/smoke.yaml @@ -37,8 +37,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/gnocchi-k8s/tests/bundles/smoke.yaml b/charms/gnocchi-k8s/tests/bundles/smoke.yaml index 1b57c1c7..dd354f89 100644 --- a/charms/gnocchi-k8s/tests/bundles/smoke.yaml +++ b/charms/gnocchi-k8s/tests/bundles/smoke.yaml @@ -29,8 +29,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/heat-k8s/tests/bundles/smoke.yaml b/charms/heat-k8s/tests/bundles/smoke.yaml index e96bd913..171697e7 100644 --- a/charms/heat-k8s/tests/bundles/smoke.yaml +++ b/charms/heat-k8s/tests/bundles/smoke.yaml @@ -36,8 +36,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/keystone-k8s/config.yaml b/charms/keystone-k8s/config.yaml index 1bd3bdd1..d122b49f 100644 --- a/charms/keystone-k8s/config.yaml +++ b/charms/keystone-k8s/config.yaml @@ -11,19 +11,6 @@ options: type: string description: Log level (WARNING, INFO, DEBUG, ERROR) - admin-user: - default: admin - description: Default admin user for keystone - type: string - admin-role: - default: Admin - description: Admin role to be associated with admin and service users - type: string - service-tenant: - default: services - description: Name of tenant to associate with service credentials - type: string - region: default: RegionOne description: Name of the OpenStack region diff --git a/charms/keystone-k8s/src/charm.py b/charms/keystone-k8s/src/charm.py index 26d216d1..fc195e26 100755 --- a/charms/keystone-k8s/src/charm.py +++ b/charms/keystone-k8s/src/charm.py @@ -1169,7 +1169,7 @@ export OS_AUTH_VERSION=3 name="admin", domain=admin_domain.get("name") ) admin_user = self.keystone_manager.ksclient.show_user( - name=self.model.config["admin-user"], + name=self.admin_user, domain=admin_domain.get("name"), project=admin_project.get("name"), project_domain=admin_domain.get("name"), @@ -1350,12 +1350,12 @@ export OS_AUTH_VERSION=3 @property def admin_user(self): """Admin User.""" - return self.model.config["admin-user"] + return "admin" @property def admin_role(self): """Admin role.""" - return self.model.config["admin-role"] + return "admin" @property def charm_user(self): @@ -1381,7 +1381,7 @@ export OS_AUTH_VERSION=3 @property def service_project(self): """Service project name.""" - return self.model.config["service-tenant"] + return "services" @property def service_project_id(self): diff --git a/charms/keystone-k8s/tests/bundles/smoke.yaml b/charms/keystone-k8s/tests/bundles/smoke.yaml index 9e9c492b..0119315c 100644 --- a/charms/keystone-k8s/tests/bundles/smoke.yaml +++ b/charms/keystone-k8s/tests/bundles/smoke.yaml @@ -28,8 +28,6 @@ applications: charm: ../../keystone-k8s.charm scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/keystone-k8s/tests/unit/test_keystone_charm.py b/charms/keystone-k8s/tests/unit/test_keystone_charm.py index ea5b0b3e..1dd6660c 100644 --- a/charms/keystone-k8s/tests/unit/test_keystone_charm.py +++ b/charms/keystone-k8s/tests/unit/test_keystone_charm.py @@ -203,7 +203,7 @@ class TestKeystoneOperatorCharm(test_utils.CharmTestCase): "admin-domain-name": "adomain_name", "admin-project-id": "aproject_id", "admin-project-name": "aproject_name", - "admin-role": "Admin", + "admin-role": "admin", "admin-user-id": "auser_id", "admin-user-name": "auser_name", "api-version": "v3", diff --git a/charms/keystone-ldap-k8s/tests/bundles/smoke.yaml b/charms/keystone-ldap-k8s/tests/bundles/smoke.yaml index 7f073fa3..5924bb84 100644 --- a/charms/keystone-ldap-k8s/tests/bundles/smoke.yaml +++ b/charms/keystone-ldap-k8s/tests/bundles/smoke.yaml @@ -29,8 +29,6 @@ applications: series: jammy scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/magnum-k8s/tests/bundles/smoke.yaml b/charms/magnum-k8s/tests/bundles/smoke.yaml index 465bbb12..69e9e44f 100644 --- a/charms/magnum-k8s/tests/bundles/smoke.yaml +++ b/charms/magnum-k8s/tests/bundles/smoke.yaml @@ -30,8 +30,7 @@ applications: channel: 2024.1/edge scale: 1 trust: false - options: - admin-role: admin + storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/neutron-k8s/tests/bundles/smoke.yaml b/charms/neutron-k8s/tests/bundles/smoke.yaml index d88e6ed1..b233bd57 100644 --- a/charms/neutron-k8s/tests/bundles/smoke.yaml +++ b/charms/neutron-k8s/tests/bundles/smoke.yaml @@ -30,8 +30,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/nova-k8s/tests/bundles/smoke.yaml b/charms/nova-k8s/tests/bundles/smoke.yaml index c22f7d68..e6331afb 100644 --- a/charms/nova-k8s/tests/bundles/smoke.yaml +++ b/charms/nova-k8s/tests/bundles/smoke.yaml @@ -37,8 +37,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/octavia-k8s/tests/bundles/smoke.yaml b/charms/octavia-k8s/tests/bundles/smoke.yaml index a2f5b8b9..42ff7f72 100644 --- a/charms/octavia-k8s/tests/bundles/smoke.yaml +++ b/charms/octavia-k8s/tests/bundles/smoke.yaml @@ -30,8 +30,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/openstack-exporter-k8s/tests/bundles/smoke.yaml b/charms/openstack-exporter-k8s/tests/bundles/smoke.yaml index 2c63b2c5..96dd00ca 100644 --- a/charms/openstack-exporter-k8s/tests/bundles/smoke.yaml +++ b/charms/openstack-exporter-k8s/tests/bundles/smoke.yaml @@ -21,8 +21,7 @@ applications: channel: 2024.1/edge scale: 1 trust: false - options: - admin-role: admin + storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/ovn-central-k8s/tests/bundles/smoke.yaml b/charms/ovn-central-k8s/tests/bundles/smoke.yaml index 221132d2..0aa230f4 100644 --- a/charms/ovn-central-k8s/tests/bundles/smoke.yaml +++ b/charms/ovn-central-k8s/tests/bundles/smoke.yaml @@ -28,8 +28,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/ovn-relay-k8s/tests/bundles/smoke.yaml b/charms/ovn-relay-k8s/tests/bundles/smoke.yaml index 249d9d5e..b6106263 100644 --- a/charms/ovn-relay-k8s/tests/bundles/smoke.yaml +++ b/charms/ovn-relay-k8s/tests/bundles/smoke.yaml @@ -30,8 +30,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/charms/placement-k8s/tests/bundles/smoke.yaml b/charms/placement-k8s/tests/bundles/smoke.yaml index d4e2d9f5..aaf35392 100644 --- a/charms/placement-k8s/tests/bundles/smoke.yaml +++ b/charms/placement-k8s/tests/bundles/smoke.yaml @@ -35,8 +35,6 @@ applications: channel: 2024.1/edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/ops-sunbeam/doc/bundles/full.yaml b/ops-sunbeam/doc/bundles/full.yaml index ac31d914..07b5d9dc 100644 --- a/ops-sunbeam/doc/bundles/full.yaml +++ b/ops-sunbeam/doc/bundles/full.yaml @@ -27,8 +27,6 @@ applications: channel: edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/ops-sunbeam/doc/bundles/minimal.yaml b/ops-sunbeam/doc/bundles/minimal.yaml index ed7b96d7..61d90a4d 100644 --- a/ops-sunbeam/doc/bundles/minimal.yaml +++ b/ops-sunbeam/doc/bundles/minimal.yaml @@ -28,8 +28,6 @@ applications: channel: edge scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/tests/caas/smoke.yaml.j2 b/tests/caas/smoke.yaml.j2 index 789c676b..c65b9676 100644 --- a/tests/caas/smoke.yaml.j2 +++ b/tests/caas/smoke.yaml.j2 @@ -62,8 +62,6 @@ applications: base: ubuntu@22.04 scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/tests/ceph/smoke.yaml.j2 b/tests/ceph/smoke.yaml.j2 index d29973fc..ca8129a9 100644 --- a/tests/ceph/smoke.yaml.j2 +++ b/tests/ceph/smoke.yaml.j2 @@ -34,8 +34,6 @@ applications: base: ubuntu@22.04 scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/tests/core/smoke.yaml.j2 b/tests/core/smoke.yaml.j2 index 0fe710ff..4cada60d 100644 --- a/tests/core/smoke.yaml.j2 +++ b/tests/core/smoke.yaml.j2 @@ -67,8 +67,6 @@ applications: base: ubuntu@22.04 scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/tests/misc/smoke.yaml.j2 b/tests/misc/smoke.yaml.j2 index aee9c95e..9c6db6c1 100644 --- a/tests/misc/smoke.yaml.j2 +++ b/tests/misc/smoke.yaml.j2 @@ -39,8 +39,6 @@ applications: base: ubuntu@22.04 scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M diff --git a/tests/tempest/smoke.yaml.j2 b/tests/tempest/smoke.yaml.j2 index 962f6684..e4b70d73 100644 --- a/tests/tempest/smoke.yaml.j2 +++ b/tests/tempest/smoke.yaml.j2 @@ -67,8 +67,6 @@ applications: base: ubuntu@22.04 scale: 1 trust: true - options: - admin-role: admin storage: fernet-keys: 5M credential-keys: 5M