From 0b357bb262248c4b031d5f6f30b680f4825ce070 Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Mon, 23 May 2016 03:21:51 -0400 Subject: [PATCH] added user-domain-name config --- config.yaml | 5 +++++ hooks/neutron_plumgrid_context.py | 1 + templates/kilo/plumlib.ini | 1 + 3 files changed, 7 insertions(+) diff --git a/config.yaml b/config.yaml index 6855a42..e30e843 100644 --- a/config.yaml +++ b/config.yaml @@ -49,3 +49,8 @@ options: default: None description: | Proxy address to install python modules behind a proxy + user-domain-name: + type: string + default: Default + description: | + Keystone user domain name diff --git a/hooks/neutron_plumgrid_context.py b/hooks/neutron_plumgrid_context.py index 470abec..0d2bb56 100644 --- a/hooks/neutron_plumgrid_context.py +++ b/hooks/neutron_plumgrid_context.py @@ -118,6 +118,7 @@ class NeutronPGPluginContext(context.NeutronContext): pg_ctxt['pg_metadata_port'] = '8775' pg_ctxt['metadata_mode'] = 'tunnel' pg_ctxt['connector_type'] = config('connector-type') + pg_ctxt['user_domain_name'] = config('user-domain-name') if enable_metadata: plumgrid_edge_ctxt = _edge_context() pg_ctxt['nova_metadata_proxy_secret'] = \ diff --git a/templates/kilo/plumlib.ini b/templates/kilo/plumlib.ini index df85c02..50dc3d7 100644 --- a/templates/kilo/plumlib.ini +++ b/templates/kilo/plumlib.ini @@ -59,4 +59,5 @@ admin_password = {{ admin_password }} 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 }} {% endif -%}