Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/fix-db-migrations into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

If the neutron-api relation was present then this charm was dropping management of neutron which included the neutron config files. Unfortunately those files are needed to run the db migrations. This mp stops the services associated with the neutron files from being managed but reinstates the management of the files themselves.

I have tested by doing a deployment and omitting the nova-cc <-> mysql relation. Then, adding the relation in and checking that a db migration is run correctly and that the neutron-server is restarted on the neutron-api server

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #742 nova-cloud-controller-next for gnuoy mp239389
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.742:
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value

Full lint output: http://paste.ubuntu.com/8641966/
Build: http://10.98.191.181:8080/job/charm_lint_check/742/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #550 nova-cloud-controller-next for gnuoy mp239389
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.550:
----------------------------------------------------------------------
Ran 96 tests in 9.060s

OK

Full unit output: http://paste.ubuntu.com/8641977/
Build: http://10.98.191.181:8080/job/charm_unit_test/550/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #295 nova-cloud-controller-next for gnuoy mp239389
    AMULET OK: believed to pass, but you should confirm results

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.295:
juju-test.conductor DEBUG : Tearing down osci-sv01 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv01"
WARNING cannot delete security group "juju-osci-sv01-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8642180/
Build: http://10.98.191.181:8080/job/charm_amulet_test/295/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-10-22 21:07:15 +0000
+++ hooks/nova_cc_utils.py	2014-10-23 15:10:01 +0000
@@ -232,42 +232,44 @@
     else:
         resource_map.pop(APACHE_24_CONF)
 
+    resource_map[NOVA_CONF]['contexts'].append(
+        nova_cc_context.NeutronCCContext())
+    # pop out irrelevant resources from the OrderedDict (easier than adding
+    # them late)
+    if net_manager != 'quantum':
+        [resource_map.pop(k) for k in list(resource_map.iterkeys())
+         if 'quantum' in k]
+    if net_manager != 'neutron':
+        [resource_map.pop(k) for k in list(resource_map.iterkeys())
+         if 'neutron' in k]
+    # add neutron plugin requirements. nova-c-c only needs the
+    # neutron-server associated with configs, not the plugin agent.
+    if net_manager in ['quantum', 'neutron']:
+        plugin = neutron_plugin()
+        if plugin:
+            conf = neutron_plugin_attribute(plugin, 'config', net_manager)
+            ctxts = (neutron_plugin_attribute(plugin, 'contexts',
+                                              net_manager)
+                     or [])
+            services = neutron_plugin_attribute(plugin, 'server_services',
+                                                net_manager)
+            resource_map[conf] = {}
+            resource_map[conf]['services'] = services
+            resource_map[conf]['contexts'] = ctxts
+            resource_map[conf]['contexts'].append(
+                nova_cc_context.NeutronCCContext())
+
+            # update for postgres
+            resource_map[conf]['contexts'].append(
+                nova_cc_context.NeutronPostgresqlDBContext())
+
     if is_relation_made('neutron-api'):
-        [resource_map.pop(k) for k in list(resource_map.iterkeys())
-         if 'quantum' in k or 'neutron' in k]
+        for k in list(resource_map.iterkeys()):
+            # neutron-api runs neutron services
+            if 'quantum' in k or 'neutron' in k:
+                resource_map[k]['services'] = []
         resource_map[NOVA_CONF]['contexts'].append(
             nova_cc_context.NeutronAPIContext())
-    else:
-        resource_map[NOVA_CONF]['contexts'].append(
-            nova_cc_context.NeutronCCContext())
-        # pop out irrelevant resources from the OrderedDict (easier than adding
-        # them late)
-        if net_manager != 'quantum':
-            [resource_map.pop(k) for k in list(resource_map.iterkeys())
-             if 'quantum' in k]
-        if net_manager != 'neutron':
-            [resource_map.pop(k) for k in list(resource_map.iterkeys())
-             if 'neutron' in k]
-        # add neutron plugin requirements. nova-c-c only needs the
-        # neutron-server associated with configs, not the plugin agent.
-        if net_manager in ['quantum', 'neutron']:
-            plugin = neutron_plugin()
-            if plugin:
-                conf = neutron_plugin_attribute(plugin, 'config', net_manager)
-                ctxts = (neutron_plugin_attribute(plugin, 'contexts',
-                                                  net_manager)
-                         or [])
-                services = neutron_plugin_attribute(plugin, 'server_services',
-                                                    net_manager)
-                resource_map[conf] = {}
-                resource_map[conf]['services'] = services
-                resource_map[conf]['contexts'] = ctxts
-                resource_map[conf]['contexts'].append(
-                    nova_cc_context.NeutronCCContext())
-
-                # update for postgres
-                resource_map[conf]['contexts'].append(
-                    nova_cc_context.NeutronPostgresqlDBContext())
 
     # nova-conductor for releases >= G.
     if os_release('nova-common') not in ['essex', 'folsom']:

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-10-10 13:37:30 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-10-23 15:10:01 +0000
@@ -186,7 +186,7 @@
             '/etc/neutron/neutron.conf',
         ]
         for q_conf in confs:
-            self.assertFalse(q_conf in _map.keys())
+            self.assertEquals(_map[q_conf]['services'], [])
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_resource_map_vmware(self, subcontext):