Merge lp:~gnuoy/charms/trusty/openstack-dashboard/1420708 into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Liam Young]

[lp:~gnuoy/charms/trusty/openstack-dashboard/1420708]

52. By Liam Young on 2015-02-11

Remove -t option as it's not needed when openstack-origin is correctly set

[James Page (james-page)]

review: Approve

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-01-13 14:46:23 +0000
+++ hooks/horizon_hooks.py	2015-02-11 11:37:08 +0000
@@ -17,6 +17,7 @@
     filter_installed_packages,
 )
 from charmhelpers.core.host import (
+    lsb_release,
     restart_on_change
 )
 from charmhelpers.contrib.openstack.utils import (
@@ -58,6 +59,9 @@
     packages = PACKAGES[:]
     if os_release('openstack-dashboard') < 'icehouse':
         packages += ['nodejs', 'node-less']
+    if lsb_release()['DISTRIB_CODENAME'] == 'precise':
+        # Explicitly upgrade python-six Bug#1420708
+        apt_install('python-six', fatal=True)
     apt_install(filter_installed_packages(packages), fatal=True)
 
 

=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2015-01-13 14:46:23 +0000
+++ unit_tests/test_horizon_hooks.py	2015-02-11 11:37:08 +0000
@@ -33,6 +33,7 @@
     'get_iface_for_address',
     'get_netmask_for_address',
     'update_nrpe_config',
+    'lsb_release',
 ]
 
 
@@ -60,6 +61,19 @@
         self.apt_update.assert_called_with(fatal=True)
         self.apt_install.assert_called_with(['foo', 'bar'], fatal=True)
 
+    def test_install_hook_precise(self):
+        self.filter_installed_packages.return_value = ['foo', 'bar']
+        self.os_release.return_value = 'icehouse'
+        self.lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'}
+        self._call_hook('install')
+        self.configure_installation_source.assert_called_with('distro')
+        self.apt_update.assert_called_with(fatal=True)
+        calls = [
+            call('python-six', fatal=True),
+            call(['foo', 'bar'], fatal=True),
+        ]
+        self.apt_install.assert_has_calls(calls)
+
     def test_install_hook_icehouse_pkgs(self):
         self.os_release.return_value = 'icehouse'
         self._call_hook('install')