Install nodejs for RHEL/Fedora
nodejs is required for Horizon (ships a copy of lessc internally). I
couldn't find nodejs in the rpm list, despite it being installed in
lib/horizon. This adds to the rpm list as NOPRIME and retains the old
install point.
RHEL6 has nodejs in EPEL now, so we remove the old hack that installed
an upstream version and add it to the install mentioned previously
Change-Id: Ib3ee2f7d77e22666c9055c8528288c01b46a95d3
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 151e7e2..cf16cdb 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -3,6 +3,7 @@
gcc
httpd # NOPRIME
mod_wsgi # NOPRIME
+nodejs # NOPRIME
pylint
python-anyjson
python-BeautifulSoup
diff --git a/lib/horizon b/lib/horizon
index 1ee530e..ab11399 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -73,31 +73,6 @@
fi
}
-# Basic install of upstream nodejs for platforms that want it
-function install_nodejs() {
- if [[ $(which node) ]]; then
- echo "You already appear to have nodejs, skipping install"
- return
- fi
-
- # There are several node deployment scripts; one may be more
- # appropriate at some future point, but for now direct download is
- # the simplest way. The version barely matters for lesscss which
- # doesn't use anything fancy.
- local ver=0.10.1
- local nodejs=node-v${ver}-linux-x64
- local tar=$nodejs.tar.gz
- local nodejs_url=http://nodejs.org/dist/v${ver}/${tar}
-
- curl -Ss ${nodejs_url} | tar -C ${DEST} -xz
- if [ $? -ne 0 ]; then
- echo "*** Download of nodejs failed"
- return 1
- fi
-
- # /usr/bin so it gets found in the PATH available to horizon
- sudo ln -s $DEST/$nodejs/bin/node /usr/bin/node
-}
# Entry Points
# ------------
@@ -105,15 +80,7 @@
# cleanup_horizon() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_horizon() {
-
- if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
- # if the /usr/bin/node link looks like it's pointing into $DEST,
- # then we installed it via install_nodejs
- if [[ $(readlink -f /usr/bin/node) =~ ($DEST) ]]; then
- sudo rm /usr/bin/node
- fi
- fi
-
+ :
}
# configure_horizon() - Set config files, create data dirs, etc
@@ -199,21 +166,12 @@
exit_distro_not_supported "apache installation"
fi
- if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
- # RHEL6 currently has no native way to get nodejs, so we do a
- # basic install here (see cleanup_horizon too).
- # TODO: does nova have a better way that we can limit
- # requirement of site-wide nodejs install?
- install_nodejs
- fi
-
# 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 && [[ "$os_RELEASE" -ge "18" ]]; then
- # fedora 18 and higher gets nodejs
+ elif is_fedora && [[ $DISTRO =~ (rhel6) || "$os_RELEASE" -ge "18" ]]; then
install_package nodejs
fi