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

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-09-29 13:58:29 +0000
+++ hooks/nova_cc_hooks.py	2014-10-01 08:33:10 +0000
@@ -40,6 +40,7 @@
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     openstack_upgrade_available,
+    os_release,
 )
 
 from charmhelpers.contrib.openstack.neutron import (
@@ -179,6 +180,9 @@
     if relation_ids('neutron-api'):
         log('Not running neutron database migration as neutron-api service'
             'is present.')
+    elif os_release('nova-common') <= 'icehouse':
+        log('Not running neutron database migration as migrations are handled'
+            'by the neutron-server process.')
     else:
         migrate_neutron_database()
         # neutron-api service may have appeared while the migration was

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2014-09-29 13:58:29 +0000
+++ unit_tests/test_nova_cc_hooks.py	2014-10-01 08:33:10 +0000
@@ -39,6 +39,7 @@
     'is_relation_made',
     'local_unit',
     'log',
+    'os_release',
     'relation_get',
     'relation_set',
     'relation_ids',
@@ -508,8 +509,18 @@
         )
 
     def test_conditional_neutron_migration_noapi_rel(self):
+        self.os_release.return_value = 'juno'
         self.relation_ids.return_value = []
-        hooks.conditional_neutron_migration()
         self.services.return_value = ['neutron-server']
-        self.migrate_neutron_database.assert_called()
-        self.service_restart.assert_called()
+        hooks.conditional_neutron_migration()
+        self.migrate_neutron_database.assert_called_with()
+        self.service_restart.assert_called_with('neutron-server')
+
+    def test_conditional_neutron_migration_noapi_rel_juno(self):
+        self.os_release.return_value = 'icehouse'
+        self.relation_ids.return_value = []
+        hooks.conditional_neutron_migration()
+        self.log.assert_called_with(
+            'Not running neutron database migration as migrations are handled'
+            'by the neutron-server process.'
+        )