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

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-07-12 23:01:31 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-08-30 12:21:23 +0000
@@ -385,6 +385,15 @@
                 - [nova-key4, value4]
 """
 
+NOVA_SUB_CONFIG3 = """
+nova-compute:
+    /etc/nova/nova.conf:
+        sections:
+            DEFAULT:
+                - [nova-key5, value5]
+                - [nova-key6, value6]
+"""
+
 CINDER_SUB_CONFIG1 = """
 cinder:
     /etc/cinder/cinder.conf:
@@ -448,6 +457,12 @@
             'private-address': 'nova_node1',
             'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG2)),
         },
+    },
+    'neutron-plugin:4': {
+        'neutron-other-plugin/0': {
+            'private-address': 'nova_node1',
+            'subordinate_configuration': json.dumps(yaml.load(NOVA_SUB_CONFIG3)),
+        },
     }
 }
 
@@ -2340,7 +2355,9 @@
                     ['nova-key1', 'value1'],
                     ['nova-key2', 'value2'],
                     ['nova-key3', 'value3'],
-                    ['nova-key4', 'value4']]
+                    ['nova-key4', 'value4'],
+                    ['nova-key5', 'value5'],
+                    ['nova-key6', 'value6']]
             }}
         )