Merge lp:~hopem/charms/trusty/nova-cloud-controller/lp1464605-stable-backport into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

[Edward Hope-Morley]

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

charm_lint_check #5401 nova-cloud-controller for hopem mp261942
    LINT OK: passed

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

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

charm_unit_test #5033 nova-cloud-controller for hopem mp261942
    UNIT OK: passed

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

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

charm_amulet_test #4644 nova-cloud-controller for hopem mp261942
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4644/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-04-22 14:39:04 +0000
+++ hooks/nova_cc_hooks.py	2015-06-15 09:51:42 +0000
@@ -169,9 +169,14 @@
     CONFIGS.write_all()
     if console_attributes('protocol'):
         apt_update()
-        apt_install(console_attributes('packages'), fatal=True)
+        packages = console_attributes('packages') or []
+        filtered = filter_installed_packages(packages)
+        if filtered:
+            apt_install(filtered, fatal=True)
+
         [compute_joined(rid=rid)
             for rid in relation_ids('cloud-compute')]
+
     for r_id in relation_ids('identity-service'):
         identity_joined(rid=r_id)
     for rid in relation_ids('zeromq-configuration'):
 
=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-04-22 19:22:30 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-06-15 09:51:42 +0000
@@ -106,18 +106,22 @@
         self.disable_services.assert_called()
         self.cmd_all_services.assert_called_with('stop')
 
+    @patch.object(hooks, 'filter_installed_packages')
     @patch.object(hooks, 'configure_https')
-    def test_config_changed_no_upgrade(self, conf_https):
+    def test_config_changed_no_upgrade(self, conf_https, mock_filter_packages):
         self.openstack_upgrade_available.return_value = False
         hooks.config_changed()
         self.assertTrue(self.save_script_rc.called)
+        mock_filter_packages.assert_called_with([])
 
+    @patch.object(hooks, 'filter_installed_packages')
     @patch.object(hooks, 'cluster_joined')
     @patch.object(hooks, 'identity_joined')
     @patch.object(hooks, 'neutron_api_relation_joined')
     @patch.object(hooks, 'configure_https')
     def test_config_changed_with_upgrade(self, conf_https, neutron_api_joined,
-                                         identity_joined, cluster_joined):
+                                         identity_joined, cluster_joined,
+                                         mock_filter_packages):
         self.openstack_upgrade_available.return_value = True
         self.relation_ids.return_value = ['generic_rid']
         _zmq_joined = self.patch('zeromq_configuration_relation_joined')
@@ -128,6 +132,7 @@
         self.assertTrue(_zmq_joined.called)
         self.assertTrue(cluster_joined.called)
         self.assertTrue(self.save_script_rc.called)
+        mock_filter_packages.assert_called_with([])
 
     def test_compute_changed_ssh_migration(self):
         self.test_relation.set({