Merge "horizon replaced nodejs by a python alternative" into stable/h…

…avana
xbezdick · Jan 8, 2014 · 47ad268 · 47ad268
2 parents 6f5f602 + 65e43be
commit 47ad268
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -112,11 +112,6 @@
     warning('swift parameter is deprecated and has no effect.')
   }
 
-  # I am totally confused by this, I do not think it should be installed...
-  if ($::osfamily == 'Debian') {
-    package { 'node-less': }
-  }
-
   file { $::horizon::params::httpd_config_file: }
 
   Service <| title == 'memcached' |> -> Class['horizon']

diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb
@@ -522,8 +522,3 @@ SECURITY_GROUP_RULES = {
 LOGIN_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/login/'
 LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
 LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
-
-# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
-# offline compression by default.  To enable online compression, install
-# the node-less package and enable the following option.
-COMPRESS_OFFLINE = True