Juju Charms Collection
neutron-api-plumgrid package

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

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Junaid Ali
Status: Merged
Merged at revision: 23
Proposed branch: lp:~junaidali/charms/trusty/neutron-api-plumgrid/trunk
Merge into: lp:~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk
Diff against target: 53 lines (+8/-0)
4 files modified
config.yaml (+4/-0)
hooks/neutron_plumgrid_context.py (+1/-0)
templates/kilo/plumlib.ini (+1/-0)
unit_tests/test_neutron_plumgrid_plugin_context.py (+2/-0)
To merge this branch: bzr merge lp:~junaidali/charms/trusty/neutron-api-plumgrid/trunk
Reviewer Review Type Date Requested Status
Bilal Baqar Approve
Javeria Khan Approve
Review via email: mp+298058@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Javeria Khan (javeria-ak) :
review: Approve
Revision history for this message
Bilal Baqar (bbaqar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2016-05-24 04:58:18 +0000
3+++ config.yaml 2016-06-21 18:31:25 +0000
4@@ -53,3 +53,7 @@
5 type: string
6 default: Default
7 description: Keystone user domain name
8+ project-domain-name:
9+ type: string
10+ default: Default
11+ description: Keystone project domain name
12
13=== modified file 'hooks/neutron_plumgrid_context.py'
14--- hooks/neutron_plumgrid_context.py 2016-05-23 07:21:51 +0000
15+++ hooks/neutron_plumgrid_context.py 2016-06-21 18:31:25 +0000
16@@ -119,6 +119,7 @@
17 pg_ctxt['metadata_mode'] = 'tunnel'
18 pg_ctxt['connector_type'] = config('connector-type')
19 pg_ctxt['user_domain_name'] = config('user-domain-name')
20+ pg_ctxt['project_domain_name'] = config('project-domain-name')
21 if enable_metadata:
22 plumgrid_edge_ctxt = _edge_context()
23 pg_ctxt['nova_metadata_proxy_secret'] = \
24
25=== modified file 'templates/kilo/plumlib.ini'
26--- templates/kilo/plumlib.ini 2016-05-23 07:21:51 +0000
27+++ templates/kilo/plumlib.ini 2016-06-21 18:31:25 +0000
28@@ -60,4 +60,5 @@
29 auth_uri = {{ service_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0/
30 identity_version = v2.0
31 user_domain_name = {{ user_domain_name }}
32+project_domain_name = {{ project_domain_name }}
33 {% endif -%}
34
35=== modified file 'unit_tests/test_neutron_plumgrid_plugin_context.py'
36--- unit_tests/test_neutron_plumgrid_plugin_context.py 2016-05-24 04:58:18 +0000
37+++ unit_tests/test_neutron_plumgrid_plugin_context.py 2016-06-21 18:31:25 +0000
38@@ -61,6 +61,7 @@
39 'switch-password': 'plumgrid',
40 'connector-type': 'service',
41 'user-domain-name': 'Default',
42+ 'project-domain-name': 'Default'
43 }
44
45 def mock_config(key=None):
46@@ -92,6 +93,7 @@
47 'metadata_mode': 'tunnel',
48 'connector_type': 'service',
49 'user_domain_name': 'Default',
50+ 'project_domain_name': 'Default',
51 'nova_metadata_proxy_secret': 'plumgrid',
52 'pg_metadata_ip': '169.254.169.254',
53 'pg_metadata_subnet': '169.254.169.254/30',

Subscribers

People subscribed via source and target branches

to all changes: