Merge lp:~gnuoy/charm-helpers/bug1618422 into lp:charm-helpers

Proposed by Liam Young
Status: Merged
Merged at revision: 681
Proposed branch: lp:~gnuoy/charm-helpers/bug1618422
Merge into: lp:charm-helpers
Diff against target: 42 lines (+18/-1)
1 file modified
tests/contrib/openstack/test_os_contexts.py (+18/-1)
To merge this branch: bzr merge lp:~gnuoy/charm-helpers/bug1618422
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+304368@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/contrib/openstack/test_os_contexts.py'
2--- tests/contrib/openstack/test_os_contexts.py 2016-07-12 23:01:31 +0000
3+++ tests/contrib/openstack/test_os_contexts.py 2016-08-30 12:21:23 +0000
4@@ -385,6 +385,15 @@
5 - [nova-key4, value4]
6 """
7
8+NOVA_SUB_CONFIG3 = """
9+nova-compute:
10+ /etc/nova/nova.conf:
11+ sections:
12+ DEFAULT:
13+ - [nova-key5, value5]
14+ - [nova-key6, value6]
15+"""
16+
17 CINDER_SUB_CONFIG1 = """
18 cinder:
19 /etc/cinder/cinder.conf:
20@@ -448,6 +457,12 @@
21 'private-address': 'nova_node1',
22 'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG2)),
23 },
24+ },
25+ 'neutron-plugin:4': {
26+ 'neutron-other-plugin/0': {
27+ 'private-address': 'nova_node1',
28+ 'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG3)),
29+ },
30 }
31 }
32
33@@ -2340,7 +2355,9 @@
34 ['nova-key1', 'value1'],
35 ['nova-key2', 'value2'],
36 ['nova-key3', 'value3'],
37- ['nova-key4', 'value4']]
38+ ['nova-key4', 'value4'],
39+ ['nova-key5', 'value5'],
40+ ['nova-key6', 'value6']]
41 }}
42 )
43

Subscribers

People subscribed via source and target branches