x
/
fuel-plugin-xenserver
Code Issues Proposed changes

Merge "Improve error condition handling in controller deployment"

This commit is contained in:
Jenkins 2016-10-03 10:50:52 +00:00 committed by Gerrit Code Review
parent 9748446c4d 55315baea2
commit f15c61b0d4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin_source/deployment_scripts/controller_post_deployment.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -eu
LOG_ROOT="/var/log/@PLUGIN_NAME@/"
mkdir -p $LOG_ROOT
@ -18,7 +18,7 @@ function replace_test_image {
if [[ -n "$image_id" ]]; then
echo "Delete image $image_name" >> $LOG_FILE
glance image-delete $image_id &>> $LOG_FILE
glance image-delete $image_id 2>&1 &>> $LOG_FILE
fi
echo "Create image $image_name" >> $LOG_FILE
@ -29,7 +29,7 @@ function replace_test_image {
--property vm_mode="$vm_mode" \
--visibility public \
--file "$image_file" \
&>> $LOG_FILE
2>&1 &>> $LOG_FILE
}
function mod_novnc {
@ -53,11 +53,11 @@ EOF
source /root/openrc admin
echo "Before image replacement" >> $LOG_FILE
glance image-list >> $LOG_FILE
glance image-list 2>&1 >> $LOG_FILE
replace_test_image "TestVM" "xen" cirros-0.3.4-x86_64-disk.vhd.tgz
echo "After image replacement" >> $LOG_FILE
glance image-list >> $LOG_FILE
glance image-list 2>&1 >> $LOG_FILE
mod_novnc