openstack
/
monasca-analytics
Code Issues Proposed changes

Improve the devstack plugin 

Delete a infinite loop and add a process of removing packages
at the "clean_monasca_analytics" function.

Change-Id: I8cef33e149d0814a7b0d07abf4c6635497b78f79
This commit is contained in:
Daisuke Fujita 2016-08-09 07:53:43 +00:00 committed by Hisashi Osanai
parent dd9a67b9fa
commit 754e90cf09
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devstack/plugin.sh
View File

@ -105,7 +105,7 @@ function unstack_spark {
function clean_monasca_analytics {
set +o errexit
unstack_monasca_analytics
clean_monasca_analytics
unistall_pkgs
set -o errexit
}
@ -119,6 +119,24 @@ function delete_spark_directories {
sudo rm -rf /var/log/spark-events || true
}
###
function unistall_pkgs {
sudo apt-get -y purge ipython python-scipy python-numpy
sudo apt-get -y purge python-setuptools
sudo apt-get -y purge sbt
sudo apt-key del $KEYID
sudo sed -i -e '/deb https\:\/\/dl.bintray.com\/sbt\/debian \//d' /etc/apt/sources.list.d/sbt.list
sudo dpkg -r scala
sudo apt-get -y purge openjdk-7-jdk
sudo apt-get -y purge openjdk-7-jre-headless
sudo rm -rf ~/.m2
sudo rm -rf $SPARK_DIR
}
###
function install_monasca_analytics {
echo_summary "Install Monasca-analytics"
@ -161,9 +179,9 @@ function install_pkg {
sudo -E curl $SCALA_URL -o $SPARK_DOWNLOAD/$SCALA
sudo -E dpkg -i $SPARK_DOWNLOAD/$SCALA
echo "deb https://dl.bintray.com/sbt/debian /" | sudo -E tee -a /etc/apt/sources.list.d/sbt.list
sudo -E apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 642AC823
sudo -E apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv $KEYID
sudo -E apt-get update
sudo -E apt-get -y install sbt
sudo -E apt-get -y install sbt
## other pkg
sudo -E apt-get -y install python-setuptools

1
devstack/settings
View File

@ -41,6 +41,7 @@ SCALA_VERSION=${SCALA_VERSION:-2.11}
SCALA_MIN_VERSION=${SCALA_MIN_VERSION:-.7}
SCALA="scala-${SCALA_VERSION}${SCALA_MIN_VERSION}.deb"
SCALA_URL="https://downloads.typesafe.com/scala/${SCALA_VERSION}${SCALA_MIN_VERSION}/$SCALA"
KEYID=642AC823
SPARK_DIR="/opt/spark"
SPARK_DOWNLOAD="$SPARK_DIR/download"