From 0a50f8da51733829ef7334d9faa2f462399afeaf Mon Sep 17 00:00:00 2001
From: Xicheng Chang <xicheng.chang@huawei.com>
Date: Wed, 13 Jul 2016 16:44:22 -0400
Subject: [PATCH] Update some package sources

Change-Id: I438b028e2b27ecc839fcd785fca321f028065c91
---
 install/compass.sh   |  1 +
 install/install.conf |  1 +
 install/install.sh   | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/install/compass.sh b/install/compass.sh
index 6b71faff..493df606 100755
--- a/install/compass.sh
+++ b/install/compass.sh
@@ -59,6 +59,7 @@ if [ ! -f /usr/lib64/libcrypto.so ]; then
 fi
 
 download -u "$PIP_PACKAGES"  `basename $PIP_PACKAGES` unzip /var/www/ || exit $?
+download -u "$EXTRA_PACKAGES" `basename $EXTRA_PACKAGES` unzip /var/www/ || exit $?
 
 sudo mkdir -p /opt/compass/db
 sudo chmod -R 777 /opt/compass/db
diff --git a/install/install.conf b/install/install.conf
index b09b4db9..210e9876 100755
--- a/install/install.conf
+++ b/install/install.conf
@@ -79,6 +79,7 @@ export UBUNTU_14_04_03_IMAGE_SOURCE="http://205.177.226.237:9999/ubuntu-14.04.3-
 export CENTOS_7_2_PPA_REPO_SOURCE="http://205.177.226.237:9999/centos7-juno-ppa.tar.gz"
 export UBUNTU_14_04_03_PPA_REPO_SOURCE="http://205.177.226.237:9999/trusty-mitaka-ppa.tar.gz"
 export PIP_PACKAGES="http://205.177.226.237:9999/pip.tar.gz"
+export EXTRA_PACKAGES="http://www.stack360.io/packages.tar.gz"
 
 export COBBLER_PASSWORD="cobbler"
 
diff --git a/install/install.sh b/install/install.sh
index 8a99870d..56d48b12 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -377,4 +377,26 @@ if [ "$FULL_COMPASS_SERVER" == "false" ]; then
     sed -i 's/^CELERY_DEFAULT_QUEUE.*/CELERY_DEFAULT_QUEUE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
     sed -i 's/^CELERY_DEFAULT_EXCHANGE.*/CELERY_DEFAULT_EXCHANGE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
     sed -i 's/^CELERY_DEFAULT_ROUTING_KEY.*/CELERY_DEFAULT_ROUTING_KEY = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
+
+    # Restart services
+    systemctl restart httpd.service
+    sleep 10
+    echo "Checking if httpd is running"
+    sudo systemctl status httpd.service
+    if [[ "$?" == "0" ]]; then
+        echo "httpd is running"
+    else
+        echo "httpd is not running"
+        exit 1
+    fi
+
+    systemctl restart compass-celeryd.service
+    echo "Checking if httpd is running"
+    sudo systemctl status compass-celeryd.service
+    if [[ "$?" == "0" ]]; then
+        echo "celeryd is running"
+    else
+        echo "celeryd is not running"
+        exit 1
+    fi
 fi