Browse code

horizon: drop nodejs dependency

since commit a0739c9423a4c559b45af96fa4cdb30539dcdbd7, horizon use
a pure Python alternative to nodejs

Change-Id: I231b453e42c303c3cc29e8bea4d7b935fecdccd2

Gonéri Le Bouder authored on 2013/11/05 18:35:55
Showing 5 changed files
... ...
@@ -19,5 +19,3 @@ python-kombu
19 19
 python-coverage
20 20
 python-cherrypy3 # why?
21 21
 python-migrate
22
-nodejs
23
-nodejs-legacy # dist:quantal
... ...
@@ -1,6 +1,5 @@
1 1
 apache2  # NOPRIME
2 2
 apache2-mod_wsgi  # NOPRIME
3
-nodejs
4 3
 python-CherryPy # why? (coming from apts)
5 4
 python-Paste
6 5
 python-PasteDeploy
... ...
@@ -3,7 +3,6 @@ django-registration
3 3
 gcc
4 4
 httpd # NOPRIME
5 5
 mod_wsgi  # NOPRIME
6
-nodejs # NOPRIME
7 6
 pylint
8 7
 python-anyjson
9 8
 python-BeautifulSoup
... ...
@@ -153,15 +153,6 @@ function install_horizon() {
153 153
     # Apache installation, because we mark it NOPRIME
154 154
     install_apache_wsgi
155 155
 
156
-    # NOTE(sdague) quantal changed the name of the node binary
157
-    if is_ubuntu; then
158
-        if [[ ! -e "/usr/bin/node" ]]; then
159
-            install_package nodejs-legacy
160
-        fi
161
-    elif is_fedora && [[ $DISTRO =~ (rhel6) || "$os_RELEASE" -ge "18" ]]; then
162
-        install_package nodejs
163
-    fi
164
-
165 156
     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
166 157
 }
167 158
 
... ...
@@ -76,8 +76,7 @@ fi
76 76
 if [[ $DISTRO =~ (rhel6) ]]; then
77 77
 
78 78
     # Disable selinux to avoid configuring to allow Apache access
79
-    # to Horizon files or run nodejs (LP#1175444)
80
-    # FIXME(dtroyer): see if this can be skipped without node or if Horizon is not enabled
79
+    # to Horizon files (LP#1175444)
81 80
     if selinuxenabled; then
82 81
         sudo setenforce 0
83 82
     fi