Drop use of identity-admin service

This commit is contained in:
James Page 2020-03-05 15:42:51 +00:00
parent 0b528d19c6
commit 0144d33ef6
4 changed files with 4 additions and 8 deletions

View File

@ -1,6 +1,5 @@
includes:
- 'layer:openstack-api'
- 'interface:keystone-admin'
options:
basic:
use_venv: True

View File

@ -64,7 +64,7 @@ class TrilioWLMCharm(charms_openstack.charm.HAOpenStackCharm):
services = ["wlm-api", "wlm-scheduler", "wlm-workloads"]
required_relations = [
"shared-db", "amqp", "identity-service", "identity-admin"
"shared-db", "amqp", "identity-service"
]
restart_map = {

View File

@ -8,6 +8,3 @@ tags:
- openstack
series:
- bionic
requires:
identity-admin:
interface: keystone-admin

View File

@ -54,9 +54,9 @@ triliovault_user_domain_id = {{ identity_service.service_domain_id }}
{% endif -%}
cloud_admin_user_id = 3fd8f1e8d92a4704b0a86b93bbb4269d
cloud_admin_domain = 8e7b72adde7f4a15a4f23620a1d0cfd1
cloud_admin_project_id = 56446f91358b40d3858276fe9680f5d8
cloud_admin_user_id = {{ identity_service.admin_user_id }}
cloud_admin_domain = {{ identity_service.admin_domain_id }}
cloud_admin_project_id = {{ identity_service.admin_project_id }}
cloud_admin_role = Admin
keystone_auth_version = {{ identity_service.api_version }}