summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2015-12-30 02:52:15 +0000
committerMatthewLi <matthew.lijun@huawei.com>2015-12-30 02:52:15 +0000
commit8fdd4c13d48645b2d36602a0e8d011d8a18014e2 (patch)
treef8fda22c3040b15575f8bf09ba647f4efd67a95f
parent0e343f2389d5be46aba6399757d3090ce24effab (diff)
add vm env setup and run script after instance creation
JIRA: BOTTLENECK-35 Change-Id: I9d96821779a148a38c4fea27163b49face80afb7 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rwxr-xr-xutils/infra_setup/heat_template/HOT_create_instance.sh17
-rwxr-xr-xutils/infra_setup/vm_dev_setup/setup_env.sh2
2 files changed, 16 insertions, 3 deletions
diff --git a/utils/infra_setup/heat_template/HOT_create_instance.sh b/utils/infra_setup/heat_template/HOT_create_instance.sh
index 87455106..3c96ce1c 100755
--- a/utils/infra_setup/heat_template/HOT_create_instance.sh
+++ b/utils/infra_setup/heat_template/HOT_create_instance.sh
@@ -34,11 +34,23 @@ bottlenecks_create_instance()
heat stack-show bottlenecks
nova list
nova list | grep rubbos_control
+}
+
+bottlenecks_rubbos_run()
+{
+ echo "Run Rubbos"
control_ip=$(nova list | grep rubbos_control | awk '{print $13}')
+ chmod 600 $KEY_PATH/bottlenecks_key
ssh -i $KEY_PATH/bottlenecks_key \
-o StrictHostKeyChecking=no \
-o BatchMode=yes root@$control_ip "uname -a"
- heat stack-delete bottlenecks
+ scp -r -i $KEY_PATH/bottlenecks_key \
+ -o StrictHostKeyChecking=no -o BatchMode=yes \
+ $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup \
+ root@$control_ip:/tmp
+ ssh -i $KEY_PATH/bottlenecks_key \
+ -o StrictHostKeyChecking=no \
+ -o BatchMode=yes root@$control_ip "bash /tmp/vm_dev_setup/setup_env.sh"
}
bottlenecks_cleanup()
@@ -80,7 +92,7 @@ bottlenecks_load_bottlenecks_image()
echo "load bottlenecks image"
curl --connect-timeout 10 -o /tmp/bottlenecks-trusty-server.img $IMAGE_URL -v
- if [ $?!=0 ]; then
+ if [ $? != 0 ]; then
wget http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img -O \
/tmp/bottlenecks-trusty-server.img
fi
@@ -122,6 +134,7 @@ main()
bottlenecks_cleanup
bottlenecks_load_bottlenecks_image
bottlenecks_create_instance
+ bottlenecks_rubbos_run
bottlenecks_cleanup
}
diff --git a/utils/infra_setup/vm_dev_setup/setup_env.sh b/utils/infra_setup/vm_dev_setup/setup_env.sh
index 9eba07cb..e7b8c308 100755
--- a/utils/infra_setup/vm_dev_setup/setup_env.sh
+++ b/utils/infra_setup/vm_dev_setup/setup_env.sh
@@ -52,7 +52,7 @@ bottlenecks_rubbos_install_exe()
main()
{
- PreInstall_Packages="gcc gettext g++ libaio1 libaio-dev make"
+ PreInstall_Packages="git gcc gettext g++ libaio1 libaio-dev make"
SCRIPT_DIR=`cd ${BASH_SOURCE[0]%/*};pwd`
source $SCRIPT_DIR/package.conf