openstack/devstack
Code Issues Proposed changes

Merge "horizon: drop nodejs dependency"

Browse Source
This commit is contained in:
Jenkins 2013-11-22 14:41:37 +00:00 committed by Gerrit Code Review
commit f39ecfd41b
5 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/apts/horizon
View File

@ -19,5 +19,3 @@ python-kombu
python-coverage python-coverage
python-cherrypy3 # why? python-cherrypy3 # why?
python-migrate python-migrate
nodejs
nodejs-legacy # dist:quantal

1
files/rpms-suse/horizon
View File

@ -1,6 +1,5 @@
apache2 # NOPRIME apache2 # NOPRIME
apache2-mod_wsgi # NOPRIME apache2-mod_wsgi # NOPRIME
nodejs
python-CherryPy # why? (coming from apts) python-CherryPy # why? (coming from apts)
python-Paste python-Paste
python-PasteDeploy python-PasteDeploy

1
files/rpms/horizon
View File

@ -3,7 +3,6 @@ django-registration
gcc gcc
httpd # NOPRIME httpd # NOPRIME
mod_wsgi # NOPRIME mod_wsgi # NOPRIME
nodejs # NOPRIME
pylint pylint
python-anyjson python-anyjson
python-BeautifulSoup python-BeautifulSoup

9
lib/horizon
View File

@ -153,15 +153,6 @@ function install_horizon() {
# Apache installation, because we mark it NOPRIME # Apache installation, because we mark it NOPRIME
install_apache_wsgi 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 git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
} }

3
tools/fixup_stuff.sh
View File

@ -76,8 +76,7 @@ fi
if [[ $DISTRO =~ (rhel6) ]]; then if [[ $DISTRO =~ (rhel6) ]]; then
# Disable selinux to avoid configuring to allow Apache access # Disable selinux to avoid configuring to allow Apache access
# to Horizon files or run nodejs (LP#1175444) # to Horizon files (LP#1175444)
# FIXME(dtroyer): see if this can be skipped without node or if Horizon is not enabled
if selinuxenabled; then if selinuxenabled; then
sudo setenforce 0 sudo setenforce 0
fi fi