From 394c11c72191fff6eed1543600260b9de7f55676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Tue, 5 Nov 2013 10:35:55 +0100 Subject: [PATCH] horizon: drop nodejs dependency since commit a0739c9423a4c559b45af96fa4cdb30539dcdbd7, horizon use a pure Python alternative to nodejs Change-Id: I231b453e42c303c3cc29e8bea4d7b935fecdccd2 --- files/apts/horizon | 2 -- files/rpms-suse/horizon | 1 - files/rpms/horizon | 1 - lib/horizon | 9 --------- tools/fixup_stuff.sh | 3 +-- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/files/apts/horizon b/files/apts/horizon index 0865931d44..8969046355 100644 --- a/files/apts/horizon +++ b/files/apts/horizon @@ -19,5 +19,3 @@ python-kombu python-coverage python-cherrypy3 # why? python-migrate -nodejs -nodejs-legacy # dist:quantal diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon index 73932acc1d..d3bde2690c 100644 --- a/files/rpms-suse/horizon +++ b/files/rpms-suse/horizon @@ -1,6 +1,5 @@ apache2 # NOPRIME apache2-mod_wsgi # NOPRIME -nodejs python-CherryPy # why? (coming from apts) python-Paste python-PasteDeploy diff --git a/files/rpms/horizon b/files/rpms/horizon index 0ca18cadb7..aa27ab4e97 100644 --- a/files/rpms/horizon +++ b/files/rpms/horizon @@ -3,7 +3,6 @@ django-registration gcc httpd # NOPRIME mod_wsgi # NOPRIME -nodejs # NOPRIME pylint python-anyjson python-BeautifulSoup diff --git a/lib/horizon b/lib/horizon index 4cb2828f10..5bff712743 100644 --- a/lib/horizon +++ b/lib/horizon @@ -153,15 +153,6 @@ function install_horizon() { # Apache installation, because we mark it NOPRIME install_apache_wsgi - # NOTE(sdague) quantal changed the name of the node binary - if is_ubuntu; then - if [[ ! -e "/usr/bin/node" ]]; then - install_package nodejs-legacy - fi - elif is_fedora && [[ $DISTRO =~ (rhel6) || "$os_RELEASE" -ge "18" ]]; then - install_package nodejs - fi - git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG } diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 325a6d6be1..f9362307d8 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -76,8 +76,7 @@ fi if [[ $DISTRO =~ (rhel6) ]]; then # Disable selinux to avoid configuring to allow Apache access - # to Horizon files or run nodejs (LP#1175444) - # FIXME(dtroyer): see if this can be skipped without node or if Horizon is not enabled + # to Horizon files (LP#1175444) if selinuxenabled; then sudo setenforce 0 fi