diff --git a/install/compass.sh b/install/compass.sh index 493df606..959843e6 100755 --- a/install/compass.sh +++ b/install/compass.sh @@ -121,6 +121,12 @@ else exit 1 fi +wget -O /tmp/aws_credentials "http://www.stack360.io/aws_credentials" +filename='/tmp/aws_credentials' +id=$(sed -n '1p' < $filename) +key=$(sed -n '2p' < $filename) +sudo sed -i "s~ACCESS_ID~$id~g" /etc/compass/celeryconfig +sudo sed -i "s~ACCESS_KEY~$key~g" /etc/compass/celeryconfig sudo systemctl enable compass-progress-updated.service sudo systemctl enable compass-celeryd.service diff --git a/install/prepare.sh b/install/prepare.sh index e8b724b8..40053073 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -241,6 +241,7 @@ if [[ "$?" != "0" ]]; then exit 1 fi pip install -U -r test-requirements.txt +pip install -U boto if [[ "$?" != "0" ]]; then echo "failed to install compass test requiremnts" deactivate diff --git a/install/register.sh b/install/register.sh index 089d6b36..ad18c4e8 100755 --- a/install/register.sh +++ b/install/register.sh @@ -2,18 +2,12 @@ # #set -x ### Register current user to compass -USER_EMAIL="aaa@huawei.com" +source install.conf DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) echo "The email address you use to register is ${USER_EMAIL}" password=`< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6` data=`echo "{\"email\":\"${USER_EMAIL}\",\"password\":\"${password}\"}"` wget -O /tmp/user_info --post-data=$data --header=Content-Type:application/json "http://www.stack360.io/api/users/register" -wget -O /tmp/aws_credentials "http://www.stack360.io/aws_credentials" -filename='/tmp/aws_credentials' -id=$(sed -n '1p' < $filename) -key=$(sed -n '2p' < $filename) -sudo sed -i "s~ACCESS_ID~$id~g" /etc/compass/celeryconfig -sudo sed -i "s~ACCESS_KEY~$key~g" /etc/compass/celeryconfig if [ $? -ne 0 ]; then echo "Register failed" @@ -24,3 +18,5 @@ echo "Register suceeded, your password is $password, please remember your passwo sudo sed -i 's/^CELERY_DEFAULT_QUEUE.*/CELERY_DEFAULT_QUEUE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig sudo sed -i 's/^CELERY_DEFAULT_EXCHANGE.*/CELERY_DEFAULT_EXCHANGE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig sudo sed -i 's/^CELERY_DEFAULT_ROUTING_KEY.*/CELERY_DEFAULT_ROUTING_KEY = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig + +systemctl restart compass-celeryd.service