Merge lp:~gnuoy/charms/trusty/nova-compute/subctxt-fix into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7181 nova-compute-next for gnuoy mp266262
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7181/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6645 nova-compute-next for gnuoy mp266262
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6645/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5467 nova-compute-next for gnuoy mp266262
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11961399/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5467/

[Ryan Beisner (1chb1n)]

FYI:
The test rig is on hold due to undercloud system issues. I don't anticipate having automated amulet results ahead of the 15.07 charm cut date.

[Billy Olsen (billy-olsen)]

Environment running amulet test is unreliable ATM, thus the failure...

LGTM, Approved.

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-07-29 10:48:58 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-07-29 16:12:20 +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 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-07-14 11:11:25 +0000
+++ hooks/nova_compute_utils.py	2015-07-29 16:12:20 +0000
@@ -155,12 +155,8 @@
                      NovaComputeCephContext(),
                      context.SyslogContext(),
                      context.SubordinateConfigContext(
-                         interface='nova-ceilometer',
-                         service='nova',
-                         config_file=NOVA_CONF),
-                     context.SubordinateConfigContext(
-                         interface='neutron-plugin',
-                         service='nova-compute',
+                         interface=['neutron-plugin', 'nova-ceilometer'],
+                         service=['nova-compute', 'nova'],
                          config_file=NOVA_CONF),
                      InstanceConsoleContext(),
                      context.ZeroMQContext(),