From 192fe804fab054a518d1d0556ed04ef50415834d Mon Sep 17 00:00:00 2001 From: Huan Xie Date: Thu, 24 Mar 2016 01:53:48 -0700 Subject: [PATCH] MOS8.0 Make changes to let it work with liberty 1. change glance image-create command's param 2. fix file injection problem Change-Id: Ibdda7c626605f85a0d0e7452452e82d6e07f9641 --- deployment_scripts/compute_post_deployment.py | 2 +- deployment_scripts/controller_post_deployment.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment_scripts/compute_post_deployment.py b/deployment_scripts/compute_post_deployment.py index c078990..df81efc 100755 --- a/deployment_scripts/compute_post_deployment.py +++ b/deployment_scripts/compute_post_deployment.py @@ -181,7 +181,7 @@ def create_novacompute_conf(himn, username, password, public_ip): template = '\n'.join([ '[DEFAULT]', 'compute_driver=xenapi.XenAPIDriver', - 'force_config_drive=always', + 'force_config_drive=True', 'novncproxy_base_url=https://%s:6080/vnc_auto.html', 'vncserver_proxyclient_address=%s', '[xenserver]', diff --git a/deployment_scripts/controller_post_deployment.sh b/deployment_scripts/controller_post_deployment.sh index af77651..f52b4f4 100755 --- a/deployment_scripts/controller_post_deployment.sh +++ b/deployment_scripts/controller_post_deployment.sh @@ -31,7 +31,7 @@ function create_image { --container-format ovf \ --disk-format vhd \ --property vm_mode="$vm_mode" \ - --is-public True \ + --visibility public \ --file "$image_file" \ &>> $LOG_FILE @@ -64,4 +64,4 @@ create_image "TestVM" "xen" "http://ca.downloads.xensource.com/OpenStack/cirros- create_image "F17-x86_64-cfntools" "hvm" "http://ca.downloads.xensource.com/OpenStack/F21-x86_64-cfntools.tgz" glance image-list >> $LOG_FILE -mod_novnc \ No newline at end of file +mod_novnc