Merge lp:~junaidali/charms/trusty/neutron-api-plumgrid/trunk into lp:~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk

[Junaid Ali]

[Javeria Khan (javeria-ak)]

review: Approve

[Bilal Baqar (bbaqar)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-05-24 04:58:18 +0000
+++ config.yaml	2016-06-21 18:31:25 +0000
@@ -53,3 +53,7 @@
     type: string
     default: Default
     description: Keystone user domain name
+  project-domain-name:
+    type: string
+    default: Default
+    description: Keystone project domain name
 
=== modified file 'hooks/neutron_plumgrid_context.py'
--- hooks/neutron_plumgrid_context.py	2016-05-23 07:21:51 +0000
+++ hooks/neutron_plumgrid_context.py	2016-06-21 18:31:25 +0000
@@ -119,6 +119,7 @@
         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'] = \
 
=== modified file 'templates/kilo/plumlib.ini'
--- templates/kilo/plumlib.ini	2016-05-23 07:21:51 +0000
+++ templates/kilo/plumlib.ini	2016-06-21 18:31:25 +0000
@@ -60,4 +60,5 @@
 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 -%}
 
=== modified file 'unit_tests/test_neutron_plumgrid_plugin_context.py'
--- unit_tests/test_neutron_plumgrid_plugin_context.py	2016-05-24 04:58:18 +0000
+++ unit_tests/test_neutron_plumgrid_plugin_context.py	2016-06-21 18:31:25 +0000
@@ -61,6 +61,7 @@
             'switch-password': 'plumgrid',
             'connector-type': 'service',
             'user-domain-name': 'Default',
+            'project-domain-name': 'Default'
         }
 
         def mock_config(key=None):
@@ -92,6 +93,7 @@
             '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',