Merge lp:~niedbalski/charm-helpers/fix-1518001 into lp:charm-helpers

[Jorge Niedbalski]

Dear Maintainer:

This patch adds a new context for handling the libvirt options
in the same way config-flags affects the default section.

[Felipe Reyes (freyes)]

LGTM +1

review: Approve

[Jorge Niedbalski (niedbalski)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-10-07 21:51:23 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-11-19 17:35:47 +0000
@@ -1088,6 +1088,20 @@
                 config_flags_parser(config_flags)}
 
 
+class LibvirtConfigFlagsContext(OSContextGenerator):
+    """
+    This context provides support for extending
+    the libvirt section through user-defined flags.
+    """
+    def __call__(self):
+        ctxt = {}
+        libvirt_flags = config('libvirt-flags')
+        if libvirt_flags:
+            ctxt['libvirt_flags'] = config_flags_parser(
+                libvirt_flags)
+        return ctxt
+
+
 class SubordinateConfigContext(OSContextGenerator):
 
     """

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-10-07 10:57:11 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-11-19 17:35:47 +0000
@@ -1014,6 +1014,19 @@
 
         self.assertEquals(result, expected)
 
+    def test_libvirt_config_flags(self):
+        self.config.side_effect = fake_config({
+            'libvirt-flags': 'iscsi_use_multipath=True,chap_auth=False',
+        })
+
+        results = context.LibvirtConfigFlagsContext()()
+        self.assertEquals(results, {
+            'libvirt_flags': {
+                'chap_auth': 'False',
+                'iscsi_use_multipath': 'True'
+            }
+        })
+
     def test_ceph_no_relids(self):
         '''Test empty ceph realtion'''
         relation = FakeRelation(relation_data={})