summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hua <john.hua@citrix.com>2016-04-13 11:09:29 +0800
committerJohn Hua <john.hua@citrix.com>2016-04-13 18:19:07 +0800
commit919898d48fcd9fc5d5c6944832cb7fcff3e806fc (patch)
tree7917d8f2264692de528957aca8f91e3c6ddbc811
parentc30bc7f8db2b98e41e6414a6c1abdc6be9de9e54 (diff)
Fix test images
* Remove F17-x86_64-cfntools as it is not in use in MOS8 * Fix deprecated glance CLI options * Embed cirros inside the plugin Change-Id: Ib2e62e3acb4aa7c21ae3433588cc60a28c8a4a96
Notes
Notes (review): Code-Review+1: John Hua <john.hua@citrix.com> Code-Review+1: huan <huan.xie@citrix.com> Code-Review+2: Bob Ball <bob.ball@citrix.com> Workflow+1: Bob Ball <bob.ball@citrix.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 14 Apr 2016 08:51:19 +0000 Reviewed-on: https://review.openstack.org/304935 Project: openstack/fuel-plugin-xenserver Branch: refs/heads/master
-rw-r--r--deployment_scripts/cirros-0.3.4-x86_64-disk.vhd.tgzbin0 -> 12501760 bytes
-rwxr-xr-xdeployment_scripts/controller_post_deployment.sh15
2 files changed, 4 insertions, 11 deletions
diff --git a/deployment_scripts/cirros-0.3.4-x86_64-disk.vhd.tgz b/deployment_scripts/cirros-0.3.4-x86_64-disk.vhd.tgz
new file mode 100644
index 0000000..08bd3db
--- /dev/null
+++ b/deployment_scripts/cirros-0.3.4-x86_64-disk.vhd.tgz
Binary files differ
diff --git a/deployment_scripts/controller_post_deployment.sh b/deployment_scripts/controller_post_deployment.sh
index f52b4f4..36ecb4a 100755
--- a/deployment_scripts/controller_post_deployment.sh
+++ b/deployment_scripts/controller_post_deployment.sh
@@ -18,14 +18,10 @@ function create_image {
18 local vm_mode 18 local vm_mode
19 vm_mode="$2" 19 vm_mode="$2"
20 20
21 local image_url 21 local image_file
22 image_url="$3" 22 image_file="$3"
23 23
24 if ! glance image-list --name "$image_name" --property vm_mode="$vm_mode" | grep -q "$image_name"; then 24 if ! glance image-list | grep -q "$image_name"; then
25 local image_file
26 image_file=$(mktemp)
27
28 wget -q -O "$image_file" "$image_url"
29 glance image-create \ 25 glance image-create \
30 --name "$image_name" \ 26 --name "$image_name" \
31 --container-format ovf \ 27 --container-format ovf \
@@ -34,8 +30,6 @@ function create_image {
34 --visibility public \ 30 --visibility public \
35 --file "$image_file" \ 31 --file "$image_file" \
36 &>> $LOG_FILE 32 &>> $LOG_FILE
37
38 rm "$image_file"
39 fi 33 fi
40} 34}
41 35
@@ -60,8 +54,7 @@ EOF
60source /root/openrc admin 54source /root/openrc admin
61 55
62clear_images 56clear_images
63create_image "TestVM" "xen" "http://ca.downloads.xensource.com/OpenStack/cirros-0.3.4-x86_64-disk.vhd.tgz" 57create_image "TestVM" "xen" cirros-0.3.4-x86_64-disk.vhd.tgz
64create_image "F17-x86_64-cfntools" "hvm" "http://ca.downloads.xensource.com/OpenStack/F21-x86_64-cfntools.tgz"
65glance image-list >> $LOG_FILE 58glance image-list >> $LOG_FILE
66 59
67mod_novnc 60mod_novnc