Changes:
Added config project_domain_name in plumlib.ini for keystone version v3. Ticket: [SOL-1105]
This commit is contained in:
commit
4c4cd9c000
|
@ -53,3 +53,7 @@ options:
|
|||
type: string
|
||||
default: Default
|
||||
description: Keystone user domain name
|
||||
project-domain-name:
|
||||
type: string
|
||||
default: Default
|
||||
description: Keystone project domain name
|
||||
|
|
|
@ -119,6 +119,7 @@ class NeutronPGPluginContext(context.NeutronContext):
|
|||
pg_ctxt['metadata_mode'] = 'tunnel'
|
||||
pg_ctxt['connector_type'] = config('connector-type')
|
||||
pg_ctxt['user_domain_name'] = config('user-domain-name')
|
||||
pg_ctxt['project_domain_name'] = config('project-domain-name')
|
||||
if enable_metadata:
|
||||
plumgrid_edge_ctxt = _edge_context()
|
||||
pg_ctxt['nova_metadata_proxy_secret'] = \
|
||||
|
|
|
@ -60,4 +60,5 @@ admin_tenant_name = {{ admin_tenant_name }}
|
|||
auth_uri = {{ service_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0/
|
||||
identity_version = v2.0
|
||||
user_domain_name = {{ user_domain_name }}
|
||||
project_domain_name = {{ project_domain_name }}
|
||||
{% endif -%}
|
||||
|
|
|
@ -61,6 +61,7 @@ class NeutronPGContextTest(CharmTestCase):
|
|||
'switch-password': 'plumgrid',
|
||||
'connector-type': 'service',
|
||||
'user-domain-name': 'Default',
|
||||
'project-domain-name': 'Default'
|
||||
}
|
||||
|
||||
def mock_config(key=None):
|
||||
|
@ -92,6 +93,7 @@ class NeutronPGContextTest(CharmTestCase):
|
|||
'metadata_mode': 'tunnel',
|
||||
'connector_type': 'service',
|
||||
'user_domain_name': 'Default',
|
||||
'project_domain_name': 'Default',
|
||||
'nova_metadata_proxy_secret': 'plumgrid',
|
||||
'pg_metadata_ip': '169.254.169.254',
|
||||
'pg_metadata_subnet': '169.254.169.254/30',
|
||||
|
|
Loading…
Reference in New Issue