openstack/monasca-api
Code Issues Proposed changes

Merge "Update nodejs and npm packages"

Browse Source
This commit is contained in:
Zuul 2019-12-18 15:12:49 +00:00 committed by Gerrit Code Review
commit b3fb188fa7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -1264,8 +1264,9 @@ function clean_monasca_agent {
function install_nodejs { function install_nodejs {
echo_summary "Install Node.js" echo_summary "Install Node.js"
curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
apt_get install nodejs npm apt_get install nodejs
npm config set registry "http://registry.npmjs.org/"; \ npm config set registry "http://registry.npmjs.org/"; \
npm config set proxy "${HTTP_PROXY}"; \ npm config set proxy "${HTTP_PROXY}"; \
npm set strict-ssl false; npm set strict-ssl false;
@ -1296,8 +1297,7 @@ function install_monasca_grafana {
git_timed clone $GRAFANA_REPO $GRAFANA_DIR --branch $GRAFANA_BRANCH --depth 1 git_timed clone $GRAFANA_REPO $GRAFANA_DIR --branch $GRAFANA_BRANCH --depth 1
fi fi
# Is required to use python2.7 to build grafana because node-gyp support only python2 npm config set python /usr/bin/python3
npm config set python /usr/bin/python2.7
cd "${MONASCA_BASE}" cd "${MONASCA_BASE}"