Merge lp:~james-page/charms/trusty/neutron-api/lp1527230 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[James Page]

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

charm_lint_check #15554 neutron-api-next for james-page mp280834
    LINT OK: passed

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

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

charm_unit_test #14514 neutron-api-next for james-page mp280834
    UNIT OK: passed

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

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

charm_amulet_test #8324 neutron-api-next for james-page mp280834
    AMULET OK: passed

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

[David Ames (thedac)]

Looks good.

review: Approve

=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2015-10-27 14:50:30 +0000
+++ hooks/neutron_api_hooks.py	2015-12-17 12:21:55 +0000
@@ -169,7 +169,7 @@
 
     add_source(config('extra-source'), config('extra-key'))
     status_set('maintenance', 'Installing apt packages')
-    apt_update()
+    apt_update(fatal=True)
     packages = determine_packages(config('openstack-origin'))
     apt_install(packages, fatal=True)
 

=== modified file 'hooks/neutron_api_utils.py'
--- hooks/neutron_api_utils.py	2015-12-03 22:43:30 +0000
+++ hooks/neutron_api_utils.py	2015-12-17 12:21:55 +0000
@@ -207,8 +207,8 @@
 
         add_source(calico_source)
 
-        apt_update()
-        apt_upgrade()
+        apt_update(fatal=True)
+        apt_upgrade(fatal=True)
 
 
 def force_etcd_restart():

=== modified file 'unit_tests/test_neutron_api_hooks.py'
--- unit_tests/test_neutron_api_hooks.py	2015-10-27 14:50:30 +0000
+++ unit_tests/test_neutron_api_hooks.py	2015-12-17 12:21:55 +0000
@@ -128,7 +128,7 @@
         self.configure_installation_source.assert_called_with(
             'distro'
         )
-        self.apt_update.assert_called_with()
+        self.apt_update.assert_called_with(fatal=True)
         self.apt_install.assert_has_calls([
             call(_pkgs, fatal=True),
         ])
@@ -151,7 +151,7 @@
         self.configure_installation_source.assert_called_with(
             'distro'
         )
-        self.apt_update.assert_called_with()
+        self.apt_update.assert_called_with(fatal=True)
         self.apt_install.assert_has_calls([
             call(_expected_pkgs, fatal=True),
         ])
@@ -184,7 +184,7 @@
         self._call_hook('install')
         self.assertTrue(self.execd_preinstall.called)
         self.configure_installation_source.assert_called_with(repo)
-        self.apt_update.assert_called_with()
+        self.apt_update.assert_called_with(fatal=True)
         self.apt_install.assert_has_calls([
             call(_pkgs, fatal=True),
         ])