Merge lp:~gnuoy/charm-helpers/subconfs-multi-sections into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-07-27 10:15:04 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-07-29 14:22:46 +0000
@@ -1051,8 +1051,11 @@
         :param config_file : Service's config file to query sections
         :param interface   : Subordinate interface to inspect
         """
-        self.service = service
         self.config_file = config_file
+        if isinstance(service, list):
+            self.services = service
+        else:
+            self.services = [service]
         if isinstance(interface, list):
             self.interfaces = interface
         else:
@@ -1075,31 +1078,32 @@
                             'setting from %s' % rid, level=ERROR)
                         continue
 
-                    if self.service not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s service' % (rid, self.service),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.service]
-                    if self.config_file not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s' % (rid, self.config_file),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.config_file]
-                    for k, v in six.iteritems(sub_config):
-                        if k == 'sections':
-                            for section, config_list in six.iteritems(v):
-                                log("adding section '%s'" % (section),
-                                    level=DEBUG)
-                                if ctxt[k].get(section):
-                                    ctxt[k][section].extend(config_list)
-                                else:
-                                    ctxt[k][section] = config_list
-                        else:
-                            ctxt[k] = v
+                    for service in self.services:
+                        if service not in sub_config:
+                            log('Found subordinate_config on %s but it contained'
+                                'nothing for %s service' % (rid, service),
+                                level=INFO)
+                            continue
+
+                        sub_config = sub_config[service]
+                        if self.config_file not in sub_config:
+                            log('Found subordinate_config on %s but it contained'
+                                'nothing for %s' % (rid, self.config_file),
+                                level=INFO)
+                            continue
+
+                        sub_config = sub_config[self.config_file]
+                        for k, v in six.iteritems(sub_config):
+                            if k == 'sections':
+                                for section, config_list in six.iteritems(v):
+                                    log("adding section '%s'" % (section),
+                                        level=DEBUG)
+                                    if ctxt[k].get(section):
+                                        ctxt[k][section].extend(config_list)
+                                    else:
+                                        ctxt[k][section] = config_list
+                            else:
+                                ctxt[k] = v
         log("%d section(s) found" % (len(ctxt['sections'])), level=DEBUG)
         return ctxt
 
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-07-27 10:15:04 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-07-29 14:22:46 +0000
@@ -340,7 +340,7 @@
 
 
 NOVA_SUB_CONFIG2 = """
-nova:
+nova-compute:
     /etc/nova/nova.conf:
         sections:
             DEFAULT:
@@ -2097,7 +2097,7 @@
         self.relation_ids.side_effect = relation.relation_ids
         self.related_units.side_effect = relation.relation_units
         nova_sub_ctxt = context.SubordinateConfigContext(
-            service='nova',
+            service=['nova', 'nova-compute'],
             config_file='/etc/nova/nova.conf',
             interface=['nova-ceilometer', 'neutron-plugin'],
         )