Merge lp:~mwhudson/charms/trusty/openstack-dashboard/stable-no-node into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/trunk

[Michael Hudson-Doyle]

Hi, this is a backport of https://code.launchpad.net/~mwhudson/charms/trusty/openstack-dashboard/no-node/+merge/227276 to the stable branch.

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2014-01-22 10:20:24 +0000
+++ hooks/horizon_hooks.py	2014-08-29 22:22:02 +0000
@@ -22,6 +22,7 @@
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     openstack_upgrade_available,
+    os_release,
     save_script_rc
 )
 from horizon_utils import (
@@ -44,7 +45,10 @@
 def install():
     configure_installation_source(config('openstack-origin'))
     apt_update(fatal=True)
-    apt_install(filter_installed_packages(PACKAGES), fatal=True)
+    packages = PACKAGES[:]
+    if os_release('openstack-dashboard') < 'icehouse':
+        packages += ['nodejs', 'node-less']
+    apt_install(filter_installed_packages(packages), fatal=True)
 
 
 @hooks.hook('upgrade-charm')
 
=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2014-05-21 10:06:19 +0000
+++ hooks/horizon_utils.py	2014-08-29 22:22:02 +0000
@@ -26,7 +26,7 @@
 PACKAGES = [
     "openstack-dashboard", "python-keystoneclient", "python-memcache",
     "memcached", "haproxy", "python-novaclient",
-    "nodejs", "node-less", "openstack-dashboard-ubuntu-theme"
+    "openstack-dashboard-ubuntu-theme"
 ]
 
 APACHE_CONF_DIR = "/etc/apache2"
 
=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2014-04-10 16:19:57 +0000
+++ unit_tests/test_horizon_hooks.py	2014-08-29 22:22:02 +0000
@@ -28,7 +28,8 @@
     'unit_get',
     'log',
     'execd_preinstall',
-    'b64decode']
+    'b64decode',
+    'os_release']
 
 
 def passthrough(value):
@@ -48,11 +49,26 @@
 
     def test_install_hook(self):
         self.filter_installed_packages.return_value = ['foo', 'bar']
+        self.os_release.return_value = 'icehouse'
         self._call_hook('install')
         self.configure_installation_source.assert_called_with('distro')
         self.apt_update.assert_called_with(fatal=True)
         self.apt_install.assert_called_with(['foo', 'bar'], fatal=True)
 
+    def test_install_hook_icehouse_pkgs(self):
+        self.os_release.return_value = 'icehouse'
+        self._call_hook('install')
+        for pkg in ['nodejs', 'node-less']:
+            self.assertFalse(pkg in self.filter_installed_packages.call_args[0][0])
+        self.apt_install.assert_called()
+
+    def test_install_hook_pre_icehouse_pkgs(self):
+        self.os_release.return_value = 'grizzly'
+        self._call_hook('install')
+        for pkg in ['nodejs', 'node-less']:
+            self.assertTrue(pkg in self.filter_installed_packages.call_args[0][0])
+        self.apt_install.assert_called()
+
     @patch('charmhelpers.core.host.file_hash')
     @patch('charmhelpers.core.host.service')
     def test_upgrade_charm_hook(self, _service, _hash):